summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-03-27 20:11:09 +0530
committerGitHub <noreply@github.com>2023-03-27 16:41:09 +0200
commitf7fe41f9c6c455e8ced284ad2d55d2a51a5da748 (patch)
tree4d7b542aa15fae28f24d42192f00f01092799911
parent3bf3148e087ca0bf63c61f08176542a0c04be354 (diff)
fix(gradle): add support for unstable Gradle versions (#5021)
-rw-r--r--src/modules/gradle.rs25
1 files changed, 24 insertions, 1 deletions
diff --git a/src/modules/gradle.rs b/src/modules/gradle.rs
index cae79e5e4..4ff7e48ca 100644
--- a/src/modules/gradle.rs
+++ b/src/modules/gradle.rs
@@ -75,7 +75,7 @@ fn parse_gradle_version_from_properties(wrapper_properties: &str) -> Option<Stri
.rsplit_once('/')?
.1
.strip_prefix("gradle-")?
- .split_once('-')?
+ .rsplit_once('-')?
.0;
Some(version.to_string())
}
@@ -217,4 +217,27 @@ zipStorePath=wrapper/dists
Some("7.5.1".to_string())
);
}
+
+ #[test]
+ fn test_format_wrapper_properties_unstable_versions() {
+ let input = |version: &str| {
+ format!(
+ "\
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\\://services.gradle.org/distributions/gradle-{version}-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+ "
+ )
+ };
+ assert_eq!(
+ parse_gradle_version_from_properties(&input("8.1-rc-1")),
+ Some("8.1-rc-1".to_string())
+ );
+ assert_eq!(
+ parse_gradle_version_from_properties(&input("7.5.1-20220729132837+0000")),
+ Some("7.5.1-20220729132837+0000".to_string())
+ );
+ }
}