From e5a37bcc1403bf7f79649c4981b2a6ae2715c0f5 Mon Sep 17 00:00:00 2001 From: Cedric Champeau Date: Mon, 22 May 2023 10:28:49 +0200 Subject: [PATCH 1/2] Upgrade to Gradle 8 --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../build/catalogs/VersionCatalogUpdateFunctionalTest.groovy | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..fae08049 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/functionalTest/groovy/io/micronaut/build/catalogs/VersionCatalogUpdateFunctionalTest.groovy b/src/functionalTest/groovy/io/micronaut/build/catalogs/VersionCatalogUpdateFunctionalTest.groovy index 362b166a..dd87b0c7 100644 --- a/src/functionalTest/groovy/io/micronaut/build/catalogs/VersionCatalogUpdateFunctionalTest.groovy +++ b/src/functionalTest/groovy/io/micronaut/build/catalogs/VersionCatalogUpdateFunctionalTest.groovy @@ -54,9 +54,6 @@ class VersionCatalogUpdateFunctionalTest extends AbstractFunctionalTest { } } """ - settingsFile << """ - enableFeaturePreview("VERSION_CATALOGS") - """ } def cleanup() { From a9762061c72662e33a5eb9defbdc0faeaf88cc58 Mon Sep 17 00:00:00 2001 From: Cedric Champeau Date: Mon, 22 May 2023 10:40:41 +0200 Subject: [PATCH 2/2] Bump Groovy version to match that of Gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4078a5ad..9f2c4cfb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,6 @@ projectDesc=Micronaut internal Gradle plugins. Not intended to be used in user's projectUrl=https://micronaut.io githubSlug=micronaut-projects/micronaut-build # must match the Gradle version for functional tests to pass -groovyVersion=3.0.10 +groovyVersion=3.0.15 org.gradle.java.installations.fromEnv=JAVA_HOME org.gradle.caching=true