Use task output as Java source directory (#1100)

palantir · Feb 14, 2024 · 99c078a · 99c078a
1 parent 0932f63
commit 99c078a
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java b/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java
@@ -53,17 +53,17 @@ public void apply(Project project) {
                 createCompileSchemaTask(project, metricSchemaDir, sourceSet);
 
         Provider<Directory> generatedJavaOutputDir = metricSchemaDir.map(file -> file.dir("generated_src"));
-        TaskProvider<GenerateMetricSchemaTask> generateMetricsTask = project.getTasks()
+        TaskProvider<GenerateMetricSchemaTask> generateMetricSchemaTask = project.getTasks()
                 .register(GENERATE_METRICS, GenerateMetricSchemaTask.class, task -> {
                     task.setGroup(TASK_GROUP);
                     task.setDescription("Generates bindings for producing well defined metrics");
                     task.getInputFile().set(compileSchemaTask.flatMap(CompileMetricSchemaTask::getOutputFile));
                     task.getOutputDir().set(generatedJavaOutputDir);
                 });
 
-        getMainSourceSet(project).getJava().srcDir(generateMetricsTask);
-        configureIdea(project, generateMetricsTask, generatedJavaOutputDir);
-        configureEclipse(project, generateMetricsTask);
+        configureJavaSource(project, generateMetricSchemaTask);
+        configureIdea(project, generateMetricSchemaTask, generatedJavaOutputDir);
+        configureEclipse(project, generateMetricSchemaTask);
         configureProjectDependencies(project);
 
         createManifestTask(project, metricSchemaDir, compileSchemaTask);
@@ -99,15 +99,17 @@ private static TaskProvider<CompileMetricSchemaTask> createCompileSchemaTask(
                 .named("processResources")
                 .configure(processResources -> processResources.dependsOn(compileMetricSchema));
 
-        SourceSet mainSourceSet = getMainSourceSet(project);
-        mainSourceSet.getJava().srcDir(metricSchemaDir);
-        mainSourceSet.resources(resources -> {
-            SourceDirectorySet sourceDir = project.getObjects()
-                    .sourceDirectorySet("metricSchema", "metric schema")
-                    .srcDir(metricSchemaDir);
-            sourceDir.include("metric-schema/**");
-            resources.source(sourceDir);
-        });
+        project.getExtensions()
+                .getByType(JavaPluginExtension.class)
+                .getSourceSets()
+                .getByName(SourceSet.MAIN_SOURCE_SET_NAME)
+                .resources(resources -> {
+                    SourceDirectorySet sourceDir = project.getObjects()
+                            .sourceDirectorySet("metricSchema", "metric schema")
+                            .srcDir(metricSchemaDir);
+                    sourceDir.include("metric-schema/**");
+                    resources.source(sourceDir);
+                });
 
         return compileMetricSchema;
     }
@@ -120,10 +122,15 @@ private static SourceDirectorySet createSourceSet(Project project) {
         return sourceSet;
     }
 
-    private static SourceSet getMainSourceSet(Project project) {
-        JavaPluginExtension javaPlugin = project.getExtensions().getByType(JavaPluginExtension.class);
-        javaPlugin.withSourcesJar();
-        return javaPlugin.getSourceSets().getByName("main");
+    private static void configureJavaSource(
+            Project project, TaskProvider<GenerateMetricSchemaTask> generateMetricSchemaTask) {
+        project.getExtensions()
+                .getByType(JavaPluginExtension.class)
+                .getSourceSets()
+                .getByName(SourceSet.MAIN_SOURCE_SET_NAME)
+                .java(java -> {
+                    java.srcDir(generateMetricSchemaTask);
+                });
     }
 
     private static void configureEclipse(Project project, TaskProvider<? extends Task> generateMetrics) {