Skip to content

Commit 4db949d

Browse files
Avoid 9.1 Gradle version, should be 9.1.0 (#1002)
1 parent 8a5a704 commit 4db949d

2 files changed

Lines changed: 39 additions & 1 deletion

File tree

src/main/resources/META-INF/rewrite/java-version-25.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ recipeList:
200200
- org.openrewrite.github.SetupJavaUpgradeJavaVersion:
201201
minimumJavaMajorVersion: 25
202202
- org.openrewrite.gradle.UpdateGradleWrapper:
203-
version: 9.1
203+
version: 9.1.0
204204
addIfMissing: false
205205
- org.openrewrite.maven.UpgradePluginVersion:
206206
groupId: org.apache.maven.plugins

src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@
1717

1818
import org.junit.jupiter.api.Test;
1919
import org.openrewrite.DocumentExample;
20+
import org.openrewrite.marker.BuildTool;
2021
import org.openrewrite.test.RecipeSpec;
2122
import org.openrewrite.test.RewriteTest;
23+
import org.openrewrite.Tree;
2224

2325
import static org.assertj.core.api.Assertions.assertThat;
26+
import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
2427
import static org.openrewrite.java.Assertions.mavenProject;
2528
import static org.openrewrite.maven.Assertions.pomXml;
29+
import static org.openrewrite.properties.Assertions.properties;
30+
import static org.openrewrite.test.SourceSpecs.other;
31+
import static org.openrewrite.test.SourceSpecs.text;
2632

2733
class UpgradeToJava25Test implements RewriteTest {
2834

@@ -106,6 +112,38 @@ void upgradesMavenPluginsForJava25() {
106112
);
107113
}
108114

115+
@Test
116+
void upgradesGradleWrapperForJava25() {
117+
rewriteRun(
118+
spec -> spec.recipeFromResources("org.openrewrite.java.migrate.UpgradePluginsForJava25")
119+
.beforeRecipe(withToolingApi())
120+
.allSources(source -> source.markers(new BuildTool(Tree.randomId(), BuildTool.Type.Gradle, "8.5"))),
121+
properties(
122+
"""
123+
distributionBase=GRADLE_USER_HOME
124+
distributionPath=wrapper/dists
125+
distributionUrl=https\\://services.gradle.org/distributions/gradle-8.5-bin.zip
126+
zipStoreBase=GRADLE_USER_HOME
127+
zipStorePath=wrapper/dists
128+
""",
129+
spec -> spec.path("gradle/wrapper/gradle-wrapper.properties")
130+
.after(actual -> {
131+
assertThat(actual).containsPattern("gradle-9\\.1\\.\\d+-bin\\.zip");
132+
return actual;
133+
})
134+
),
135+
text("", spec -> spec.path("gradlew").after(a -> {
136+
assertThat(a).isNotEmpty();
137+
return a + "\n";
138+
})),
139+
text("", spec -> spec.path("gradlew.bat").after(a -> {
140+
assertThat(a).isNotEmpty();
141+
return a + "\n";
142+
})),
143+
other("", spec -> spec.path("gradle/wrapper/gradle-wrapper.jar"))
144+
);
145+
}
146+
109147
@Test
110148
void addsLombokAnnotationProcessor() {
111149
rewriteRun(

0 commit comments

Comments
 (0)