haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(java): wrong version number when using Android Studio JDK (#4966) 

The regular expression would get the revision number found in:

    with gcc Android (7284624, based on r416183b)

so it would print "7284624".
This commit is contained in:
Aurélien Gâteau 2023-04-07 15:40:23 +02:00 committed by GitHub
parent 95a036bfa1
commit de7e94884b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/java.rs
View File

@ -5,7 +5,8 @@ use crate::utils::get_command_string_output;
use std::path::PathBuf;
use regex::Regex;
const JAVA_VERSION_PATTERN: &str = "(?:JRE.*\\(|OpenJ9 )(?P<version>[\\d]+(?:\\.\\d+){0,2})";
const JAVA_VERSION_PATTERN: &str =
"(?:JRE.*\\(|OpenJ9 )(?P<version>\\d+(?:\\.\\d+){0,2}).*, built on";
/// Creates a module with the current Java version
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
@ -154,6 +155,12 @@ mod tests {
assert_eq!(parse_java_version(java_11), Some("11.0.4".to_string()));
}
#[test]
fn test_parse_java_version_android_studio_jdk() {
let java_11 = "OpenJDK 64-Bit Server VM (11.0.15+0-b2043.56-8887301) for linux-amd64 JRE (11.0.15+0-b2043.56-8887301), built on Jul 29 2022 22:12:21 by \"androidbuild\" with gcc Android (7284624, based on r416183b) Clang 12.0.5 (https://android.googlesource.com/toolchain/llvm-project c935d99d7cf2016289302412d708641d52d2f7ee)}";
assert_eq!(parse_java_version(java_11), Some("11.0.15".to_string()));
}
#[test]
fn test_parse_java_version_unknown() {
let unknown_jre = "Unknown JRE";