avoid setting a release at compile time

palantir · Oct 29, 2021 · 721458f · 721458f
1 parent c7fce7d
commit 721458f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineJavaVersion.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineJavaVersion.java
@@ -90,6 +90,7 @@ public void execute(JavaCompile javaCompile) {
                 javaCompile.getJavaCompiler().set(javaToolchainService.compilerFor(new Action<JavaToolchainSpec>() {
                     @Override
                     public void execute(JavaToolchainSpec javaToolchainSpec) {
+                        javaCompile.getOptions().getRelease().set((Integer) null);
                         javaToolchainSpec.getLanguageVersion().set(targetVersionProvider);
                     }
                 }));

diff --git a/...le-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineModuleJvmArgs.java b/...le-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineModuleJvmArgs.java
@@ -32,6 +32,8 @@
 import org.gradle.api.java.archives.Manifest;
 import org.gradle.api.tasks.JavaExec;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.tasks.testing.Test;
 import org.gradle.jvm.tasks.Jar;
 import org.gradle.process.CommandLineArgumentProvider;
@@ -54,21 +56,21 @@ public void apply(Project project) {
         project.getPluginManager().withPlugin("java", unused -> {
             BaselineExportsExtension extension =
                     project.getExtensions().create(EXTENSION_NAME, BaselineExportsExtension.class, project);
-            //            project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> {
-            //                project.getTasks()
-            //                        .named(sourceSet.getCompileJavaTaskName(), JavaCompile.class)
-            //                        .get()
-            //                        .getOptions()
-            //                        .getCompilerArgumentProviders()
-            //                        // Use an anonymous class because tasks with lambda inputs cannot be cached
-            //                        .add(new CommandLineArgumentProvider() {
-            //                            @Override
-            //                            public Iterable<String> asArguments() {
-            //                                // Annotation processors are executed at compile time
-            //                                return collectAnnotationProcessorExports(project, extension, sourceSet);
-            //                            }
-            //                        });
-            //            });
+            project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> {
+                project.getTasks()
+                        .named(sourceSet.getCompileJavaTaskName(), JavaCompile.class)
+                        .get()
+                        .getOptions()
+                        .getCompilerArgumentProviders()
+                        // Use an anonymous class because tasks with lambda inputs cannot be cached
+                        .add(new CommandLineArgumentProvider() {
+                            @Override
+                            public Iterable<String> asArguments() {
+                                // Annotation processors are executed at compile time
+                                return collectAnnotationProcessorExports(project, extension, sourceSet);
+                            }
+                        });
+            });
 
             project.getTasks().withType(Test.class, new Action<Test>() {