Add Gradle 7 support

changelog/@unreleased/pr-1824.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Add Gradle 7 support
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1824

gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/Baseline.java

@@ -50,11 +50,6 @@ public void apply(Project project) {
             proj.getPluginManager().apply(BaselineTestHeap.class);
             proj.getPluginManager().apply(BaselineJavaParameters.class);
             proj.getPluginManager().apply(BaselineImmutables.class);
-
-            // TODO(dsanduleac): enable this when people's idea{} blocks no longer reference things like
-            //    configurations.integrationTestCompile
-            // proj.getPluginManager().apply(BaselineFixGradleJava.class);
-
         });
     }
 }

gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineExactDependencies.java

@@ -89,15 +89,13 @@ private static void configureSourceSet(
             TaskProvider<CheckImplicitDependenciesParentTask> checkImplicitDependencies) {
         Configuration implementation =
                 project.getConfigurations().getByName(sourceSet.getImplementationConfigurationName());
-        Configuration compile = project.getConfigurations().getByName(sourceSet.getCompileConfigurationName());
         Configuration compileClasspath =
                 project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName());
 
         Configuration explicitCompile = project.getConfigurations()
                 .create("baseline-exact-dependencies-" + sourceSet.getName(), conf -> {
                     conf.setDescription(String.format(
-                            "Tracks the explicit (not inherited) dependencies added to either %s or %s",
-                            compile.toString(), implementation.toString()));
+                            "Tracks the explicit (not inherited) dependencies added to either %s", implementation));
                     conf.setVisible(false);
                     conf.setCanBeConsumed(false);
 
@@ -137,18 +135,11 @@ private static void configureSourceSet(
         // configurations (belonging to our source set)
         project.afterEvaluate(p -> {
             Configuration implCopy = implementation.copy();
-            Configuration compileCopy = compile.copy();
-            // Ensure it's not resolvable, otherwise plugins that resolve all configurations might have
-            // a bad time resolving this with GCV, if you have direct dependencies without corresponding entries in
-            // versions.props, but instead rely on getting a version for them from the lock file.
-            compileCopy.setCanBeResolved(false);
-            compileCopy.setCanBeConsumed(false);
             // Without these, explicitCompile will successfully resolve 0 files and you'll waste 1 hour trying
             // to figure out why.
             project.getConfigurations().add(implCopy);
-            project.getConfigurations().add(compileCopy);
 
-            explicitCompile.extendsFrom(implCopy, compileCopy);
+            explicitCompile.extendsFrom(implCopy);
         });
 
         explicitCompile.withDependencies(deps -> {

gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineReleaseCompatibility.java

@@ -56,8 +56,7 @@ private ReleaseFlagProvider(JavaCompile javaCompile) {
 
         @Override
         public Iterable<String> asArguments() {
-            JavaVersion jdkVersion =
-                    JavaVersion.toVersion(javaCompile.getToolChain().getVersion());
+            JavaVersion jdkVersion = JavaVersion.toVersion(javaCompile.getTargetCompatibility());
             if (!supportsReleaseFlag(jdkVersion)) {
                 log.debug(
                         "BaselineReleaseCompatibility is a no-op for {} in {} as {} doesn't support --release",

gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/CheckExplicitSourceCompatibilityTask.java

@@ -17,6 +17,7 @@
 package com.palantir.baseline.tasks;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
@@ -28,6 +29,8 @@
 import org.gradle.api.Task;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.plugins.internal.DefaultJavaPluginExtension;
 import org.gradle.api.provider.Property;
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.specs.Spec;
@@ -92,12 +95,7 @@ public final void setShouldFix(boolean value) {
 
     @TaskAction
     public final void taskAction() throws IOException {
-        // We're doing this naughty casting because we need access to the `getRawSourceCompatibility` method.
-        org.gradle.api.plugins.internal.DefaultJavaPluginConvention convention =
-                (org.gradle.api.plugins.internal.DefaultJavaPluginConvention)
-                        getProject().getConvention().getPlugin(JavaPluginConvention.class);
-
-        if (convention.getRawSourceCompatibility() != null) {
+        if (getRawSourceCompat() != null) {
             // In theory, users could configure the fancy new 'java toolchain' as an alternative to explicit
             // sourceCompatibility, but there's no method to access this yet (as of Gradle 6.8).
             return;
@@ -127,4 +125,24 @@ public final void taskAction() throws IOException {
                 JavaVersion.current(),
                 getPath()));
     }
+
+    private JavaVersion getRawSourceCompat() {
+        // TODO(fwindheuser): Remove internal api usage. Maybe through adopting toolchains?
+        // We're doing this naughty casting because we need access to the `getRawSourceCompatibility` method.
+        if (GradleVersion.current().compareTo(GradleVersion.version("7.0")) < 0) {
+            org.gradle.api.plugins.internal.DefaultJavaPluginConvention convention =
+                    (org.gradle.api.plugins.internal.DefaultJavaPluginConvention)
+                            getProject().getConvention().getPlugin(JavaPluginConvention.class);
+            return convention.getRawSourceCompatibility();
+        }
+
+        DefaultJavaPluginExtension extension =
+                (DefaultJavaPluginExtension) getProject().getExtensions().getByType(JavaPluginExtension.class);
+        try {
+            Method rawSourceCompat = DefaultJavaPluginExtension.class.getMethod("getRawSourceCompatibility");
+            return (JavaVersion) rawSourceCompat.invoke(extension);
+        } catch (Exception e) {
+            throw new RuntimeException("Error calling Gradle 7 getRawSourceCompatibility", e);
+        }
+    }
 }

gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineExactDependenciesTest.groovy

@@ -81,7 +81,7 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
             mavenCentral()
         }
         dependencies {
-            compile 'com.google.guava:guava:27.0.1-jre'
+            implementation 'com.google.guava:guava:27.0.1-jre'
         }
         """
         file('src/main/java/pkg/Foo.java') << minimalJavaFile
@@ -120,7 +120,7 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
         buildFile << standardBuildFile
         buildFile << """
         dependencies {
-            compile project(':needs-building-first')
+            implementation project(':needs-building-first')
         }
         """
 
@@ -156,7 +156,7 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
             mavenCentral()
         }
         dependencies {
-            compile 'com.google.guava:guava:28.0-jre'
+            implementation 'com.google.guava:guava:28.0-jre'
         }
         """
         file('src/main/java/pkg/Foo.java') << '''
@@ -181,7 +181,7 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
             mavenCentral()
         }
         dependencies {
-            compile 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.8' // pulls in guava transitively
+            implementation 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.8' // pulls in guava transitively
         }
         """
         file('src/main/java/pkg/Foo.java') << '''
@@ -248,7 +248,7 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
 
         then:
         BuildResult result = with(':checkUnusedDependencies', '--stacktrace').withDebug(true).buildAndFail()
-        result.output.contains "project(':sub-project-with-deps') (sub-project-with-deps.jar (project :sub-project-with-deps))"
+        result.output.contains "project(':sub-project-with-deps') (main (project :sub-project-with-deps))"
         result.output.contains "project(':sub-project-no-deps')"
     }
 
@@ -264,7 +264,7 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
     }
 
     /**
-     * Sets up a multi-module project with 2 sub projects.  The root project has a transitive dependency on sub-project-no-deps
+     * Sets up a multi-module project with 2 sub projects. The root project has a transitive dependency on sub-project-no-deps
      * and so checkImplicitDependencies should fail on it.
      */
     private void setupMultiProject() {
@@ -275,16 +275,18 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
             apply plugin: 'com.palantir.baseline-exact-dependencies'
         }
         dependencies {
-            compile project(':sub-project-with-deps')
+            implementation project(':sub-project-with-deps')
         }
         """.stripIndent()
 
         def subProjects = multiProject.create(["sub-project-no-deps", "sub-project-with-deps"])
 
         //properly declare dependency between two sub-projects
         subProjects['sub-project-with-deps'].buildGradle << '''
+            apply plugin: 'java-library'
+
             dependencies {
-                compile project(':sub-project-no-deps')
+                api project(':sub-project-no-deps')
             }
         '''.stripIndent()
 
@@ -323,6 +325,5 @@ class BaselineExactDependenciesTest extends AbstractPluginTest {
             }
         }
         '''.stripIndent()
-
     }
 }

gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatIntegrationTest.groovy

@@ -16,6 +16,8 @@
 
 package com.palantir.baseline
 
+import spock.lang.Unroll
+
 import java.nio.file.Files
 import java.nio.file.Path
 import org.apache.commons.io.FileUtils
@@ -27,6 +29,7 @@ import org.gradle.testkit.runner.TaskOutcome
 
 import static org.assertj.core.api.Assertions.assertThat
 
+@Unroll
 class BaselineFormatIntegrationTest extends AbstractPluginTest {
 
     def setup() {
@@ -89,7 +92,10 @@ class BaselineFormatIntegrationTest extends AbstractPluginTest {
         buildFile << standardBuildFile
 
         then:
-        with('format', '--stacktrace').build()
+        with('format', '--stacktrace').withGradleVersion(gradleVersion).build()
+
+        where:
+        gradleVersion << GradleTestVersions.VERSIONS
     }
 
     def 'eclipse formatter integration test'() {
@@ -108,12 +114,15 @@ class BaselineFormatIntegrationTest extends AbstractPluginTest {
         file('gradle.properties') << "com.palantir.baseline-format.eclipse=true\n"
 
         when:
-        BuildResult result = with(':format').build()
+        BuildResult result = with(':format').withGradleVersion(gradleVersion).build()
         result.task(":format").outcome == TaskOutcome.SUCCESS
         result.task(":spotlessApply").outcome == TaskOutcome.SUCCESS
 
         then:
         assertThatFilesAreTheSame(testedDir, expectedDir)
+
+        where:
+        gradleVersion << GradleTestVersions.VERSIONS
     }
 
     def 'palantir java format works'() {
@@ -138,12 +147,15 @@ class BaselineFormatIntegrationTest extends AbstractPluginTest {
         file('gradle.properties') << "com.palantir.baseline-format.palantir-java-format=true\n"
 
         when:
-        BuildResult result = with(':format').build()
+        BuildResult result = with(':format').withGradleVersion(gradleVersion).build()
 
         then:
         result.task(":format").outcome == TaskOutcome.SUCCESS
         result.task(":spotlessApply").outcome == TaskOutcome.SUCCESS
         assertThatFilesAreTheSame(testedDir, expectedDir)
+
+        where:
+        gradleVersion << GradleTestVersions.VERSIONS
     }
 
     private static void assertThatFilesAreTheSame(File outputDir, File expectedDir) throws IOException {

gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineIntegrationTest.groovy

@@ -44,6 +44,6 @@ class BaselineIntegrationTest extends AbstractPluginTest {
         with().withArguments('-s').withGradleVersion(gradleVersion).build()
 
         where:
-        gradleVersion << ['6.1', '6.2']
+        gradleVersion << GradleTestVersions.VERSIONS
     }
 }