Set the java launcher for Checkstyle tasks, too (#2351)

palantir · Aug 8, 2022 · 4405aec · 4405aec
1 parent cee1889
commit 4405aec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/changelog/@unreleased/pr-2351.v2.yml b/changelog/@unreleased/pr-2351.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Set the java launcher for Checkstyle tasks, too
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2351
diff --git a/...-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java b/...-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java
@@ -25,6 +25,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.plugins.quality.Checkstyle;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.CacheableTask;
@@ -131,6 +132,13 @@ public void execute(Task task) {
             }
         });
 
+        project.getTasks().withType(Checkstyle.class).configureEach(new Action<Checkstyle>() {
+            @Override
+            public void execute(Checkstyle checkstyle) {
+                checkstyle.getJavaLauncher().set(javaToolchain.flatMap(BaselineJavaToolchain::javaLauncher));
+            }
+        });
+
         project.getTasks().withType(GroovyCompile.class).configureEach(new Action<GroovyCompile>() {
             @Override
             public void execute(GroovyCompile groovyCompileTask) {