Skip to content

Commit

Permalink
fix(gradle): add support for unstable Gradle versions (#5021)
Browse files Browse the repository at this point in the history
  • Loading branch information
msfjarvis committed Mar 27, 2023
1 parent 3bf3148 commit f7fe41f
Showing 1 changed file with 24 additions and 1 deletion.
25 changes: 24 additions & 1 deletion src/modules/gradle.rs
Expand Up @@ -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())
}
Expand Down Expand Up @@ -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())
);
}
}

0 comments on commit f7fe41f

Please sign in to comment.