Merge pull request #69 from gradle/cjohnson/parse-gradle-snapshot-dis…

…tributions-urls Properly parse `distributionUrl` for Gradle snapshot distributions
gradle · Oct 28, 2022 · 6fc8159 · 6fc8159
2 parents f610541 + dad8c75
commit 6fc8159
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/release/changes.md b/release/changes.md
@@ -0,0 +1 @@
+- [FIX] - Properly parse `distributionUrl` for Gradle snapshot distributions
diff --git a/src/main/java/org/gradle/wrapperupgrade/GradleBuildToolStrategy.java b/src/main/java/org/gradle/wrapperupgrade/GradleBuildToolStrategy.java
@@ -42,7 +42,7 @@ public VersionInfo extractCurrentVersion(Path rootProjectDir) throws IOException
         return extractBuildToolVersion(rootProjectDir,
             "gradle/wrapper/gradle-wrapper.properties",
             "distributionUrl", "distributionSha256Sum",
-            "distributions/gradle-(.*)-(bin|all).zip"
+            "distributions(?:-snapshots)?/gradle-(.*)-(bin|all).zip"
         );
     }
 

diff --git a/src/test/groovy/org/gradle/wrapperupgrade/GradleBuildToolStrategyTest.groovy b/src/test/groovy/org/gradle/wrapperupgrade/GradleBuildToolStrategyTest.groovy
@@ -63,6 +63,18 @@ class GradleBuildToolStrategyTest extends Specification {
         e.message == "Could not extract version from property 'distributionUrl': unknown"
     }
 
+    def "extract current Gradle version snapshot"() {
+        given:
+        createGradleWrapperProperties().text = standard('7.6-20221024231219+0000', 'bin', '789', true)
+
+        when:
+        def version = gradleBuildToolStrategy.extractCurrentVersion(workingDir)
+
+        then:
+        version.version == '7.6-20221024231219+0000'
+        version.checksum == Optional.of('789')
+    }
+
     def "resolve release notes links"() {
         given:
         def version = '7.4.1'
@@ -74,12 +86,12 @@ class GradleBuildToolStrategyTest extends Specification {
         releaseNotesLink == 'https://docs.gradle.org/7.4.1/release-notes.html'
     }
 
-    private static String standard(String gradleVersion, String gradleDistro, String distributionChecksum) {
+    private static String standard(String gradleVersion, String gradleDistro, String distributionChecksum, boolean isSnapshot = false) {
         """
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=${distributionChecksum}
-distributionUrl=https\\://services.gradle.org/distributions/gradle-${gradleVersion}-${gradleDistro}.zip
+distributionUrl=https\\://services.gradle.org/distributions${isSnapshot ? "-snapshots": ""}/gradle-${gradleVersion}-${gradleDistro}.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 """
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [FIX] - Properly parse `distributionUrl` for Gradle snapshot distributions