Do classes instead

Author: kelvinou01

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/ConfigurationCacheTest.groovy

@@ -27,10 +27,9 @@ import java.util.stream.Collectors
 import java.util.stream.Stream
 
 class ConfigurationCacheTest extends IntegrationTestKitSpec {
-    GradlewExecutor executor
-
     private static final CLASSPATH_FILE = new File("build/impl.classpath").absolutePath
 
+    private GradlewExecutor executor
 
     def setup() {
         definePluginOutsideOfPluginBlock = true
@@ -54,17 +53,13 @@ class ConfigurationCacheTest extends IntegrationTestKitSpec {
              }
          }
          
+
+         apply plugin: 'java'
          apply plugin: 'com.palantir.baseline'
          apply plugin: 'com.palantir.consistent-versions'
          apply plugin: 'com.palantir.baseline-java-versions'
+         apply plugin: 'com.palantir.java-format'
 
-        allprojects {
-            apply plugin: 'com.palantir.java-format'
-            
-            repositories {
-                mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
-            }
-        }
         version = '0.1.0'
         """.stripIndent(true)
 
@@ -81,7 +76,7 @@ class ConfigurationCacheTest extends IntegrationTestKitSpec {
         """.stripIndent()
 
         when:
-        def result = executor.runGradlewTasks('build', '--configuration-cache', '--info')
+        def result = executor.runGradlewTasks('classes', '--configuration-cache', '--info')
 
         then:
         assert result.success

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/GradlewExecutor.groovy

@@ -17,6 +17,7 @@
 package com.palantir.javaformat.gradle
 
 import nebula.test.functional.internal.classpath.ClasspathAddingInitScriptBuilder
+import org.gradle.internal.impldep.org.eclipse.jgit.annotations.NonNull
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Path
@@ -32,9 +33,9 @@ import java.util.stream.Stream
  * This means no more eager loading of Formatters onto the classpath, no more complaints from PalantirJavaFormatStep
  */
 class GradlewExecutor {
-    File projectDir
+    private File projectDir
 
-    GradlewExecutor(File projectDir) {
+    GradlewExecutor(@NonNull File projectDir) {
         this.projectDir = projectDir
     }
 
@@ -74,7 +75,7 @@ class GradlewExecutor {
         }
     }
 
-    static String readAllInput(InputStream inputStream) {
+    private static String readAllInput(InputStream inputStream) {
         try (Stream<String> lines =
                 new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()) {
             return lines.collect(Collectors.joining("\n"));
@@ -92,5 +93,4 @@ class GradlewExecutor {
                 .redirectErrorStream(true)
         return processBuilder
     }
-
 }

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatSpotlessPluginTest.groovy

@@ -31,7 +31,12 @@ class PalantirJavaFormatSpotlessPluginTest extends IntegrationTestKitSpec {
     private static final NATIVE_IMAGE_FILE = new File("build/nativeImage.path")
     private static final NATIVE_CONFIG = String.format("palantirJavaFormatNative files(\"%s\")", NATIVE_IMAGE_FILE.text)
 
-    private final executor = new GradlewExecutor(projectDir)
+    private GradlewExecutor executor
+
+    def setup() {
+        executor = new GradlewExecutor(projectDir)
+    }
+
 
     @Unroll
     def "formats with spotless when spotless is applied"(String extraGradleProperties, String javaVersion, String expectedOutput) {