From 08342fc1546ed2b4219d852e7b9efb0a1776fe16 Mon Sep 17 00:00:00 2001 From: Greg Oledzki Date: Fri, 6 Mar 2026 11:26:49 +0100 Subject: [PATCH] Avoid 9.1 Gradle version, should be 9.1.0 --- .../META-INF/rewrite/java-version-25.yml | 2 +- .../java/migrate/UpgradeToJava25Test.java | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/rewrite/java-version-25.yml b/src/main/resources/META-INF/rewrite/java-version-25.yml index 0ac2da7858..5480985991 100644 --- a/src/main/resources/META-INF/rewrite/java-version-25.yml +++ b/src/main/resources/META-INF/rewrite/java-version-25.yml @@ -200,7 +200,7 @@ recipeList: - org.openrewrite.github.SetupJavaUpgradeJavaVersion: minimumJavaMajorVersion: 25 - org.openrewrite.gradle.UpdateGradleWrapper: - version: 9.1 + version: 9.1.0 addIfMissing: false - org.openrewrite.maven.UpgradePluginVersion: groupId: org.apache.maven.plugins diff --git a/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java b/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java index b5a009e56b..15b9a8a99c 100644 --- a/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java +++ b/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java @@ -17,12 +17,18 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.marker.BuildTool; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; +import org.openrewrite.Tree; import static org.assertj.core.api.Assertions.assertThat; +import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi; import static org.openrewrite.java.Assertions.mavenProject; import static org.openrewrite.maven.Assertions.pomXml; +import static org.openrewrite.properties.Assertions.properties; +import static org.openrewrite.test.SourceSpecs.other; +import static org.openrewrite.test.SourceSpecs.text; class UpgradeToJava25Test implements RewriteTest { @@ -106,6 +112,38 @@ void upgradesMavenPluginsForJava25() { ); } + @Test + void upgradesGradleWrapperForJava25() { + rewriteRun( + spec -> spec.recipeFromResources("org.openrewrite.java.migrate.UpgradePluginsForJava25") + .beforeRecipe(withToolingApi()) + .allSources(source -> source.markers(new BuildTool(Tree.randomId(), BuildTool.Type.Gradle, "8.5"))), + properties( + """ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists + distributionUrl=https\\://services.gradle.org/distributions/gradle-8.5-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists + """, + spec -> spec.path("gradle/wrapper/gradle-wrapper.properties") + .after(actual -> { + assertThat(actual).containsPattern("gradle-9\\.1\\.\\d+-bin\\.zip"); + return actual; + }) + ), + text("", spec -> spec.path("gradlew").after(a -> { + assertThat(a).isNotEmpty(); + return a + "\n"; + })), + text("", spec -> spec.path("gradlew.bat").after(a -> { + assertThat(a).isNotEmpty(); + return a + "\n"; + })), + other("", spec -> spec.path("gradle/wrapper/gradle-wrapper.jar")) + ); + } + @Test void addsLombokAnnotationProcessor() { rewriteRun(