gradle · bot-gradle · Jul 15, 2021 · Jul 14, 2021 · Jul 14, 2021 · Jul 14, 2021
@@ -20,7 +20,7 @@ import gradlebuild.modules.model.License
 
 abstract class ExternalModulesExtension {
 
-    val groovyVersion = "3.0.7"
+    val groovyVersion = "3.0.8"
     val kotlinVersion = "1.4.31"
 
     fun futureKotlin(module: String) = "org.jetbrains.kotlin:kotlin-$module:$kotlinVersion"

@@ -134,6 +134,10 @@
             <trusting group="org.codehaus.groovy"/>
             <trusting group="org.codehaus.groovy" name="groovy"/>
          </trusted-key>
+         <trusted-key id="34441e504a937f43eb0daef96a65176a0fb1cd0b">
+            <trusting group="org.codehaus.groovy"/>
+            <trusting group="org.codehaus.groovy" name="groovy"/>
+         </trusted-key>
          <trusted-key id="0cb5871fb7bf3b351614bbf6ca85ffe638d4407a" group="it.unimi.dsi" name="fastutil"/>
          <trusted-key id="829d279ba9a3c503eb98a0e53c48f45a0e97af7e" group="org.gebish"/>
          <trusted-key id="8446b9e902a3f3ddee711fdb8e26ff248bc7aead">
@@ -2028,11 +2032,6 @@
             <pgp value="7faa0f2206de228f0db01ad741321490758aad6f"/>
          </artifact>
       </component>
-      <component group="org.codehaus.groovy" name="groovy" version="3.0.8">
-         <artifact name="groovy-3.0.8.jar">
-            <pgp value="34441e504a937f43eb0daef96a65176a0fb1cd0b"/>
-         </artifact>
-      </component>
       <component group="org.codehaus.groovy.modules" name="http-builder-ng-core" version="0.11.1">
          <artifact name="http-builder-ng-core-0.11.1.jar">
             <pgp value="8756c4f765c9ac3cb6b85d62379ce192d401ab61"/>

diff --git a/subprojects/docs/src/docs/userguide/compatibility.adoc b/subprojects/docs/src/docs/userguide/compatibility.adoc
@@ -44,7 +44,7 @@ For older Gradle versions, please see the table below which Java version is supp
 Gradle is tested with Kotlin 1.3.72 through 1.5.10.
 
 == Groovy
-Gradle is tested with Groovy 1.5.8 through 3.0.7.
+Gradle is tested with Groovy 1.5.8 through 3.0.8.
 
 == Android
 Gradle is tested with Android Gradle Plugin 4.1, 4.2, 7.0 and 7.1. Alpha and beta versions may or may not work.
diff --git a/subprojects/docs/src/docs/userguide/migration/upgrading_version_7.adoc b/subprojects/docs/src/docs/userguide/migration/upgrading_version_7.adoc
@@ -36,6 +36,12 @@ Some plugins will break with this new version of Gradle, for example because the
 [[changes_7.2]]
 == Upgrading from 7.1 and earlier
 
+=== Potential breaking changes
+
+==== Updates to bundled Gradle dependencies
+
+- Groovy has been updated to https://groovy-lang.org/releasenotes/groovy-3.0.html[Groovy 3.0.8].
+
 === Deprecations
 
 [[java_lamdba_action]]

diff --git a/subprojects/docs/src/samples/groovy/library-publishing/groovy/my-library/build.gradle b/subprojects/docs/src/samples/groovy/library-publishing/groovy/my-library/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.codehaus.groovy:groovy-all:3.0.7'
+    implementation 'org.codehaus.groovy:groovy-all:3.0.8'
 }
 
 publishing {

diff --git a/subprojects/docs/src/samples/groovy/library-publishing/kotlin/my-library/build.gradle.kts b/subprojects/docs/src/samples/groovy/library-publishing/kotlin/my-library/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.codehaus.groovy:groovy-all:3.0.7")
+    implementation("org.codehaus.groovy:groovy-all:3.0.8")
 }
 
 publishing {

@@ -30,7 +30,7 @@ abstract class AbstractSourcesAndJavadocJarsIntegrationTest extends AbstractIdeI
     @Rule
     HttpServer server
 
-    String groovyVersion = "3.0.7"
+    String groovyVersion = "3.0.8"
 
     def setup() {
         server.start()

@@ -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;
@@ -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;
@@ -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")) {
@@ -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")) {
@@ -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;
@@ -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;
         }

@@ -17,9 +17,9 @@
 package org.gradle.performance.results
 
 import com.google.common.base.Strings
-import groovy.transform.CompileStatic
 
-@CompileStatic
+// https://issues.apache.org/jira/browse/GROOVY-10055
+//@CompileStatic
 class DefaultOutputDirSelector implements OutputDirSelector {
     private static final String DEBUG_ARTIFACTS_DIRECTORY_PROPERTY_NAME = "org.gradle.performance.debugArtifactsDirectory"
 

@@ -16,15 +16,15 @@
 
 package org.gradle.internal.reflect.validation
 
-import groovy.transform.CompileStatic
 import org.gradle.api.internal.DocumentationRegistry
 import org.gradle.integtests.fixtures.executer.GradleExecuter
 import org.gradle.internal.reflect.JavaReflectionUtil
 import org.gradle.internal.reflect.problems.ValidationProblemId
 
 import static org.gradle.internal.reflect.validation.TypeValidationProblemRenderer.convertToSingleLine
 
-@CompileStatic
+// https://issues.apache.org/jira/browse/GROOVY-10055
+//@CompileStatic
 trait ValidationMessageChecker {
     private final DocumentationRegistry documentationRegistry = new DocumentationRegistry()