Skip to content

Update Groovy to 3.0.8 for JDK17 support #17712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 15, 2021
Merged

Update Groovy to 3.0.8 for JDK17 support #17712

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79e45e1
Bump Groovy to 3.0.8 for JDK17 compatibility
rieske Jul 14, 2021
1aa0cbe
Fix dependency verification for Groovy upgrade
rieske Jul 14, 2021
033732c
Convert DefaultGradleDistribution to Groovy
rieske Jul 14, 2021
44cae64
Temporarily disable static Groovy compilation where affected by a new…
rieske Jul 14, 2021
243dbff
Merge branch 'master' into vv/bump-groovy
rieske Jul 14, 2021
7ae74bc
Fix verification metadata for Groovy 3.0.8
rieske Jul 14, 2021
b82e982
Mention Groovy update in upgrading guide
rieske Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert DefaultGradleDistribution to Groovy 
For some reason with Groovy 3.0.8, derivatives of this Java class,
which are Groovy classes fail to compile in a weird way.
  • Loading branch information
@rieske
rieske committed Jul 14, 2021
commit 033732cbf1ccca29984475ebfeadabf97db929be
68 changes: 34 additions & 34 deletions ...s/executer/DefaultGradleDistribution.java → ...executer/DefaultGradleDistribution.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,45 +25,45 @@
import org.gradle.test.fixtures.file.TestFile;
import org.gradle.util.GradleVersion;

public class DefaultGradleDistribution implements GradleDistribution {
class DefaultGradleDistribution implements GradleDistribution {
private static final String DISABLE_HIGHEST_JAVA_VERSION = "org.gradle.java.version.disableHighest";
private final GradleVersion version;
private final TestFile gradleHomeDir;
private final TestFile binDistribution;

public DefaultGradleDistribution(GradleVersion gradleVersion, TestFile gradleHomeDir, TestFile binDistribution) {
DefaultGradleDistribution(GradleVersion gradleVersion, TestFile gradleHomeDir, TestFile binDistribution) {
this.version = gradleVersion;
this.gradleHomeDir = gradleHomeDir;
this.binDistribution = binDistribution;
}

@Override
public String toString() {
String toString() {
return version.toString();
}

@Override
public TestFile getGradleHomeDir() {
TestFile getGradleHomeDir() {
return gradleHomeDir;
}

@Override
public TestFile getBinDistribution() {
TestFile getBinDistribution() {
return binDistribution;
}

@Override
public GradleVersion getVersion() {
GradleVersion getVersion() {
return version;
}

@Override
public GradleExecuter executer(TestDirectoryProvider testDirectoryProvider, IntegrationTestBuildContext buildContext) {
GradleExecuter executer(TestDirectoryProvider testDirectoryProvider, IntegrationTestBuildContext buildContext) {
return new NoDaemonGradleExecuter(this, testDirectoryProvider, version, buildContext).withWarningMode(null);
}

@Override
public boolean worksWith(Jvm jvm) {
boolean worksWith(Jvm jvm) {
// Milestone 4 was broken on the IBM jvm
if (jvm.isIbmJvm() && isVersion("1.0-milestone-4")) {
return false;
Expand All @@ -74,10 +74,10 @@ public boolean worksWith(Jvm jvm) {
throw new IllegalArgumentException();
}

return worksWith(javaVersion);
return doesWorkWith(javaVersion);
}

private boolean worksWith(JavaVersion javaVersion) {
private boolean doesWorkWith(JavaVersion javaVersion) {
// 0.9-rc-1 was broken for Java 5
if (isVersion("0.9-rc-1") && javaVersion == JavaVersion.VERSION_1_5) {
return false;
Expand Down Expand Up @@ -131,7 +131,7 @@ private boolean worksWith(JavaVersion javaVersion) {
}

@Override
public boolean worksWith(OperatingSystem os) {
boolean worksWith(OperatingSystem os) {
// 1.0-milestone-5 was broken where jna was not available
//noinspection SimplifiableIfStatement
if (isVersion("1.0-milestone-5")) {
Expand All @@ -151,37 +151,37 @@ private boolean maybeEnforceHighestVersion(JavaVersion javaVersion, JavaVersion
}

@Override
public boolean isDaemonIdleTimeoutConfigurable() {
boolean isDaemonIdleTimeoutConfigurable() {
return isSameOrNewer("1.0-milestone-7");
}

@Override
public boolean isToolingApiSupported() {
boolean isToolingApiSupported() {
return isSameOrNewer("1.0-milestone-3");
}

@Override
public boolean isToolingApiTargetJvmSupported(JavaVersion javaVersion) {
return worksWith(javaVersion);
boolean isToolingApiTargetJvmSupported(JavaVersion javaVersion) {
return doesWorkWith(javaVersion);
}

@Override
public boolean isToolingApiLocksBuildActionClasses() {
boolean isToolingApiLocksBuildActionClasses() {
return isSameOrOlder("3.0");
}

@Override
public boolean isToolingApiLoggingInEmbeddedModeSupported() {
boolean isToolingApiLoggingInEmbeddedModeSupported() {
return isSameOrNewer("2.9-rc-1");
}

@Override
public boolean isToolingApiStdinInEmbeddedModeSupported() {
boolean isToolingApiStdinInEmbeddedModeSupported() {
return isSameOrNewer("5.6-rc-1");
}

@Override
public CacheVersion getArtifactCacheLayoutVersion() {
CacheVersion getArtifactCacheLayoutVersion() {
if (isSameOrNewer("1.9-rc-2")) {
return CacheLayout.META_DATA.getVersionMapping().getVersionUsedBy(this.version).get();
} else if (isSameOrNewer("1.9-rc-1")) {
Expand All @@ -200,7 +200,7 @@ public CacheVersion getArtifactCacheLayoutVersion() {
}

@Override
public boolean wrapperCanExecute(GradleVersion version) {
boolean wrapperCanExecute(GradleVersion version) {
if (version.equals(GradleVersion.version("0.8")) || isVersion("0.8")) {
// There was a breaking change after 0.8
return false;
Expand All @@ -219,77 +219,77 @@ public boolean wrapperCanExecute(GradleVersion version) {
}

@Override
public boolean isWrapperSupportsGradleUserHomeCommandLineOption() {
boolean isWrapperSupportsGradleUserHomeCommandLineOption() {
return isSameOrNewer("1.7");
}

@Override
public boolean isSupportsSpacesInGradleAndJavaOpts() {
boolean isSupportsSpacesInGradleAndJavaOpts() {
return isSameOrNewer("1.0-milestone-5");
}

@Override
public boolean isFullySupportsIvyRepository() {
boolean isFullySupportsIvyRepository() {
return isSameOrNewer("1.0-milestone-7");
}

@Override
public boolean isAddsTaskExecutionExceptionAroundAllTaskFailures() {
boolean isAddsTaskExecutionExceptionAroundAllTaskFailures() {
return isSameOrNewer("5.0");
}

@Override
public boolean isToolingApiRetainsOriginalFailureOnCancel() {
boolean isToolingApiRetainsOriginalFailureOnCancel() {
// Versions before 5.1 would unpack the exception and throw part of it, losing some context
return isSameOrNewer("5.1-rc-1");
}

@Override
public boolean isToolingApiDoesNotAddCausesOnTaskCancel() {
boolean isToolingApiDoesNotAddCausesOnTaskCancel() {
// Versions before 5.1 would sometimes add some additional 'build cancelled' exceptions
return isSameOrNewer("5.1-rc-1");
}

@Override
public boolean isToolingApiHasCauseOnCancel() {
boolean isToolingApiHasCauseOnCancel() {
// Versions before 3.2 would throw away the cause. There was also a regression in 4.0.x
return isSameOrNewer("3.2") && !(isSameOrNewer("4.0") && isSameOrOlder("4.0.2"));
}

@Override
public boolean isToolingApiHasCauseOnForcedCancel() {
boolean isToolingApiHasCauseOnForcedCancel() {
// Versions before 5.1 would discard context on forced cancel
return isSameOrNewer("5.1-rc-1");
}

@Override
public boolean isToolingApiLogsFailureOnCancel() {
boolean isToolingApiLogsFailureOnCancel() {
// Versions before 4.1 would log "CONFIGURE SUCCESSFUL" for model/action execution (but "BUILD FAILED" for task/test execution)
return isSameOrNewer("4.1");
}

@Override
public boolean isToolingApiHasCauseOnPhasedActionFail() {
boolean isToolingApiHasCauseOnPhasedActionFail() {
return isSameOrNewer("5.1-rc-1");
}

@Override
public boolean isToolingApiMergesStderrIntoStdout() {
boolean isToolingApiMergesStderrIntoStdout() {
return isSameOrNewer("4.7") && isSameOrOlder("5.0");
}

@Override
public boolean isToolingApiLogsConfigureSummary() {
boolean isToolingApiLogsConfigureSummary() {
return isSameOrNewer("2.14");
}

@Override
public boolean isToolingApiHasExecutionPhaseBuildOperation() {
boolean isToolingApiHasExecutionPhaseBuildOperation() {
return isSameOrNewer("7.1-rc-1");
}

@Override
public <T> T selectOutputWithFailureLogging(T stdout, T stderr) {
<T> T selectOutputWithFailureLogging(T stdout, T stderr) {
if (isSameOrNewer("4.0") && isSameOrOlder("4.6") || isSameOrNewer("5.1-rc-1")) {
return stderr;
}
Expand Down