Skip to content

Commit 697d092

Browse files
Fixing services to downloads for subdomain on Gradle distributions, retaining test showing it can migrate that for you as well. (#949)
1 parent da5c278 commit 697d092

File tree

3 files changed

+33
-7
lines changed

3 files changed

+33
-7
lines changed

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
3+
distributionUrl=https\://downloads.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/resources/META-INF/rewrite/examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,13 +2107,13 @@ examples:
21072107
- before: |
21082108
distributionBase=GRADLE_USER_HOME
21092109
distributionPath=wrapper/dists
2110-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
2110+
distributionUrl=https\://downloads.gradle.org/distributions/gradle-6.7-bin.zip
21112111
zipStoreBase=GRADLE_USER_HOME
21122112
zipStorePath=wrapper/dists
21132113
after: |
21142114
distributionBase=GRADLE_USER_HOME
21152115
distributionPath=wrapper/dists
2116-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
2116+
distributionUrl=https\://downloads.gradle.org/distributions/gradle-6.9.4-bin.zip
21172117
zipStoreBase=GRADLE_USER_HOME
21182118
zipStorePath=wrapper/dists
21192119
distributionSha256Sum=3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a

src/test/java/org/openrewrite/gradle/spring/UpdateGradleTest.java

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ void upgradeGradleWrapperAndPlugins() {
9292
"""
9393
distributionBase=GRADLE_USER_HOME
9494
distributionPath=wrapper/dists
95-
distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-bin.zip
95+
distributionUrl=https\\://downloads.gradle.org/distributions/gradle-6.7-bin.zip
9696
zipStoreBase=GRADLE_USER_HOME
9797
zipStorePath=wrapper/dists
9898
""",
9999
//language=properties
100100
"""
101101
distributionBase=GRADLE_USER_HOME
102102
distributionPath=wrapper/dists
103-
distributionUrl=https\\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
103+
distributionUrl=https\\://downloads.gradle.org/distributions/gradle-6.9.4-bin.zip
104104
zipStoreBase=GRADLE_USER_HOME
105105
zipStorePath=wrapper/dists
106106
distributionSha256Sum=3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a
@@ -134,6 +134,32 @@ void upgradeGradleWrapperAndPlugins() {
134134
);
135135
}
136136

137+
@Test
138+
void handlesUpdatingGradleUrlFromServicesToDownloads() {
139+
rewriteRun(
140+
properties(
141+
//language=properties
142+
"""
143+
distributionBase=GRADLE_USER_HOME
144+
distributionPath=wrapper/dists
145+
distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-bin.zip
146+
zipStoreBase=GRADLE_USER_HOME
147+
zipStorePath=wrapper/dists
148+
""",
149+
//language=properties
150+
"""
151+
distributionBase=GRADLE_USER_HOME
152+
distributionPath=wrapper/dists
153+
distributionUrl=https\\://downloads.gradle.org/distributions/gradle-6.9.4-bin.zip
154+
zipStoreBase=GRADLE_USER_HOME
155+
zipStorePath=wrapper/dists
156+
distributionSha256Sum=3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a
157+
""",
158+
spec -> spec.path("gradle/wrapper/gradle-wrapper.properties")
159+
)
160+
);
161+
}
162+
137163
@Test
138164
void dontAddSpringDependencyManagementWhenUsingGradlePlatform() {
139165
rewriteRun(
@@ -183,15 +209,15 @@ implementation platform("org.springframework.boot:spring-boot-dependencies:%s")
183209
"""
184210
distributionBase=GRADLE_USER_HOME
185211
distributionPath=wrapper/dists
186-
distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-bin.zip
212+
distributionUrl=https\\://downloads.gradle.org/distributions/gradle-6.7-bin.zip
187213
zipStoreBase=GRADLE_USER_HOME
188214
zipStorePath=wrapper/dists
189215
""",
190216
//language=properties
191217
"""
192218
distributionBase=GRADLE_USER_HOME
193219
distributionPath=wrapper/dists
194-
distributionUrl=https\\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
220+
distributionUrl=https\\://downloads.gradle.org/distributions/gradle-6.9.4-bin.zip
195221
zipStoreBase=GRADLE_USER_HOME
196222
zipStorePath=wrapper/dists
197223
distributionSha256Sum=3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a

0 commit comments

Comments
 (0)