Upgrade to Gradle 8.5 RC1

See gh-96
ciscoo · Nov 13, 2023 · 22c8227 · 22c8227
1 parent cce8459
commit 22c8227
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/...radle/src/functionalTest/java/io/mateo/cxf/codegen/ConfigurationCacheFunctionalTests.java b/...radle/src/functionalTest/java/io/mateo/cxf/codegen/ConfigurationCacheFunctionalTests.java
@@ -34,7 +34,9 @@ void configurationCacheCompatibility(GradleBuild gradleBuild) {
 		BuildResult initialResult = runner.build();
 		BuildResult finalResult = runner.build();
 
-		assertThat(initialResult.getOutput()).contains("no configuration cache is available");
+		assertThat(initialResult.getOutput()).satisfiesAnyOf(
+				output -> assertThat(output).contains("no configuration cache is available"),
+				output -> assertThat(output).contains("no cached configuration is available"));
 		assertThat(finalResult.getOutput()).contains("Reusing configuration cache.");
 	}
 

diff --git a/cxf-codegen-gradle/src/functionalTest/java/io/mateo/junit/GradleCompatibilityExtension.java b/cxf-codegen-gradle/src/functionalTest/java/io/mateo/junit/GradleCompatibilityExtension.java
@@ -36,7 +36,7 @@
  */
 public final class GradleCompatibilityExtension implements TestTemplateInvocationContextProvider {
 
-	private static final List<String> GRADLE_8_VERSIONS = List.of("8.2.1", "8.3", "current");
+	private static final List<String> GRADLE_8_VERSIONS = List.of("8.3", "8.4", "current");
 
 	private static final List<String> DEFAULT_GRADLE_VERSIONS;
 

diff --git a/documentation/src/docs/asciidoc/overview.adoc b/documentation/src/docs/asciidoc/overview.adoc
@@ -57,8 +57,8 @@ The CXF Codegen Gradle plugin supports the following Gradle versions:
 | Gradle 8
 
 a|
-- 8.2.1
 - 8.3
+- 8.4
 - {current-gradle-version}
 |===
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-Original file line number
+Diff line change
@@ Expand Up @@
     | Gradle 8
     a|
-    - 8.2.1
     - 8.3
+    - 8.4
     - {current-gradle-version}
     |===
@@ Expand Down @@