Add Gradle 7 support #1824

fawind · 2021-07-12T16:53:51Z

After this PR

Add support for Gradle 7. This raises the minimum required Gradle version to 6.7.

==COMMIT_MSG==
Add Gradle 7 support
==COMMIT_MSG==

changelog-app · 2021-07-12T16:53:55Z

Generate changelog in `changelog/@unreleased`

Type

Description

Add Gradle 7 support. Increase minimum required Gradle version to 6.7.

Check the box to generate changelog(s)

Generate changelog entry

fawind · 2021-07-12T16:56:47Z

...e-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());


This break is hard to work around. Ideally we would still get the compile configuration as an optional if present. However with Gradle 7, the getCompileConfigurationName method no longer exists and the method for deriving the configuration name based on the task is private (code ref).

Can we just reimplement that logic while we support Gradle 6?

Yep, its actually quite the simple method. Added it for now.

fawind · 2021-07-12T17:07:00Z

...aseline-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());


The JavaCompile#getToolChain method got removed and I am not sure what a good replacement is.

I replaced it with targetCompat for now but they are not equivalent. Maybe we can use JavaVersion#current here?

Does something like:

Optional<JavaVersion> taskTarget = Optional.ofNullable(javaCompile .getProject() .getExtensions() .getByType(JavaPluginExtension.class) .getToolchain() .getLanguageVersion() .getOrNull()) .map(JavaLanguageVersion::asInt) .map(JavaVersion::toVersion);

replace it exactly? Not sure if it's an exact replacement, but tests seem to pass at least.

I think JavaPluginExtension#getToolchain is just always empty unless your explicitly configure a toolchain in your build.gradle

I think what we can do is use getToolchain().getLanguageVersion().orElseGet(JavaVersion::current). In this case we would use the toolchain jdk version if specified and otherwise fall back to the global java version. Pushed up this version for now.

Only thing is that the new getToolchain methods only exists since Gradle 6.7. We can either use Gradle 6.7 as the new minimum required Gradle version for baseline or do something like this again:

if (Gradle 6.7+) { get new toolchain through reflection } else { get old toolchain through reflection }

fawind · 2021-07-13T13:12:45Z

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

@@ -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 =


The internal API got moved to a different class. Naively, we could fix this with reflection based on the runtime Gradle version but that doesn't sound sustainable. Maybe this is a good time to lean into toolchains?

doesn't java plugin extension exist since gradle 4.10? Maybe we can standardise on that?

The extension exists since then but the internal method getRawSourceCompatibility that we abuse here got moved from the convention to the extension with Gradle 7. So we can't use the extension for versions before that.

I'll do a bit more digging. Still hoping we find a non-internal way of figuring out if sourceCompat is explicitly set. Another alternative would be to actually look into projects gradle files and fail of sourceCompat is not set, similar to the baseline error-prone rules.

CRogers · 2021-07-14T15:14:57Z

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

+        DefaultJavaPluginExtension extension =
+                (DefaultJavaPluginExtension) getProject().getExtensions().getByType(JavaPluginExtension.class);
+        try {
+            Method rawSourceCompat = DefaultJavaPluginExtension.class.getMethod("getRawSourceCompatibility");


Grim, but I can't immediately think of way to do this better (since the gradle jar we build against is 6.x, this API does not exist, right?). When this repo upgrades to 7, we'll probably need to switch this up and make the convention version use reflection, right?

Yep, then we have to do reflection for the old method. But this should fail loudly once we upgrade to build with Gradle 7 as the JavaPluginConvention#getRawSourceCompatibility can no longer be found.

CRogers · 2021-07-14T15:18:00Z

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

-
-            // TODO(dsanduleac): enable this when people's idea{} blocks no longer reference things like
-            //    configurations.integrationTestCompile
-            // proj.getPluginManager().apply(BaselineFixGradleJava.class);


CRogers · 2021-07-14T16:32:13Z

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

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Add Gradle 7 support


Do we require a new minimum gradle version now? If so, should probably make it a break.

If we decide with this one then we would require Gradle 6.7.

If we avoid this compile dependency e.g. through reflection, I don't think we introduce a new min version.

CRogers · 2021-07-16T13:35:05Z

👍

###### _excavator_ is a bot for automating changes across repositories. Changes produced by the roomba/latest-baseline-oss check. # Release Notes ## 3.99.0-rc1 | Type | Description | Link | | ---- | ----------- | ---- | | Improvement | Add Gradle 7 support | palantir/gradle-baseline#1824 | ## 4.0.0 | Type | Description | Link | | ---- | ----------- | ---- | | Break | Add Gradle 7 support. Increase minimum required Gradle version to 6.7. | palantir/gradle-baseline#1824 | To enable or disable this check, please contact the maintainers of Excavator.

schlosna · 2021-07-18T22:39:54Z

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

- *
- * <p>This will probably break some plugins in the wild, but we'd rather deal with that now than later.
- */
-public final class BaselineFixGradleJava implements Plugin<Project> {


we should remove this in the readme.md as it is still mentioned and removal of this plugin caused excavator failure palantir/tritium#1147

* Where: Build file '/home/circleci/project/build.gradle' line: 36 * What went wrong: A problem occurred evaluating root project 'tritium'. > Plugin with id 'com.palantir.baseline-fix-gradle-java' not found.

gradle-baseline/README.md

Lines 414 to 426 in d2b734a

## com.palantir.baseline-fix-gradle-java (off by default)

Fixes up all Java [SourceSets](https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_source_sets)

by marking their deprecated [configurations](https://docs.gradle.org/current/userguide/java_plugin.html#tab:configurations)

- `compile` and `runtime` - as well as the `compileOnly` configuration as not resolvable

(can't call resolve on them) and not consumable (can't be depended on from other projects).

See [here](https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs)

for a more in-depth discussion on what these terms mean. By configuring them thusly, we are saying that these configurations

now fulfil the "Bucket of dependencies" role described in that document, as they should.

This will become the default in Gradle 7 and leaving these as they currently are can cause both unnecessary confusion

(users looking in `compile` instead of `compileClasspath`) and [random crashes](https://github.com/gradle/gradle/issues/11844#issuecomment-585219427).

Good flag, will follow up with a PR!

Removed in gradle-baseline 4.0.0 per palantir/gradle-baseline#1824

Add Gradle 7 support

bf1ecb1

fawind added the do not merge label Jul 12, 2021

Add generated changelog entries

bb125ec

fawind requested a review from CRogers July 12, 2021 16:54

fawind commented Jul 12, 2021

View reviewed changes

Workaround for explicit source compat

94d7fff

fawind force-pushed the fw/gradle-7 branch from dcde957 to 94d7fff Compare July 13, 2021 13:11

fawind commented Jul 13, 2021

View reviewed changes

fawind added 2 commits July 13, 2021 17:32

Remove deprecated call from CompileRefasterTask

2dd814a

Fix test report deprecation

a5805b4

CRogers reviewed Jul 14, 2021

View reviewed changes

Reimplement getCompileConfigurationName

fa89626

nastra mentioned this pull request Jul 15, 2021

Not working with Gradle 7 multi projects #1819

Closed

fawind and others added 5 commits July 15, 2021 14:34

Use Gradle 6.7 toolchain method

6245a97

Fixes

6c00125

Dont import internal api

b7040f7

Merge remote-tracking branch 'origin/develop' into fw/gradle-7

6522db5

Autorelease 3.99.0-rc1

00b4ba6

fawind and others added 6 commits July 16, 2021 16:26

Enforce 6.7 as minimum Gradle version

56aba78

Add generated changelog entries

96b5464

Add generated changelog entries

80a5f55

Add generated changelog entries

8e6de8d

Remove unused project arg; Fix version check

787ce15

Merge remote-tracking branch 'origin/develop' into fw/gradle-7

3982ae8

fawind marked this pull request as ready for review July 16, 2021 14:40

schlosna reviewed Jul 18, 2021

View reviewed changes

schlosna added a commit to palantir/tritium that referenced this pull request Jul 18, 2021

Remove baseline-fix-gradle-java

ac34d96

Removed in gradle-baseline 4.0.0 per palantir/gradle-baseline#1824

fawind mentioned this pull request Jul 19, 2021

Remove baseline-fix-gradle-java readme section #1833

Merged

svc-excavator-bot mentioned this pull request Aug 1, 2021

Excavator: Upgrades Baseline to the latest version palantir/conjure#914

Merged

svc-excavator-bot mentioned this pull request Nov 16, 2021

Excavator: Upgrades Baseline to the latest version palantir/conjure-java-example#548

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Gradle 7 support #1824

Add Gradle 7 support #1824

fawind commented Jul 12, 2021 •

edited

changelog-app bot commented Jul 12, 2021 •

edited by fawind

fawind Jul 12, 2021

CRogers Jul 14, 2021

fawind Jul 14, 2021

fawind Jul 12, 2021 •

edited

CRogers Jul 14, 2021

fawind Jul 15, 2021

fawind Jul 15, 2021 •

edited

fawind Jul 13, 2021

robert3005 Jul 13, 2021

fawind Jul 13, 2021

CRogers Jul 14, 2021

fawind Jul 15, 2021 •

edited

CRogers Jul 14, 2021

CRogers Jul 14, 2021

fawind Jul 15, 2021

CRogers commented Jul 16, 2021

schlosna Jul 18, 2021

fawind Jul 19, 2021

fawind Jul 19, 2021

	## com.palantir.baseline-fix-gradle-java (off by default)

	Fixes up all Java [SourceSets](https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_source_sets)
	by marking their deprecated [configurations](https://docs.gradle.org/current/userguide/java_plugin.html#tab:configurations)
	- `compile` and `runtime` - as well as the `compileOnly` configuration as not resolvable
	(can't call resolve on them) and not consumable (can't be depended on from other projects).

	See [here](https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs)
	for a more in-depth discussion on what these terms mean. By configuring them thusly, we are saying that these configurations
	now fulfil the "Bucket of dependencies" role described in that document, as they should.

	This will become the default in Gradle 7 and leaving these as they currently are can cause both unnecessary confusion
	(users looking in `compile` instead of `compileClasspath`) and [random crashes](https://github.com/gradle/gradle/issues/11844#issuecomment-585219427).

Add Gradle 7 support #1824

Add Gradle 7 support #1824

Conversation

fawind commented Jul 12, 2021 • edited

After this PR

changelog-app bot commented Jul 12, 2021 • edited by fawind

Generate changelog in changelog/@unreleased

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fawind Jul 12, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fawind Jul 15, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fawind Jul 15, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CRogers commented Jul 16, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fawind commented Jul 12, 2021 •

edited

changelog-app bot commented Jul 12, 2021 •

edited by fawind

Generate changelog in `changelog/@unreleased`

fawind Jul 12, 2021 •

edited

fawind Jul 15, 2021 •

edited

fawind Jul 15, 2021 •

edited