Skip to content

Commit 898bf41

Browse files
Merge pull request #556 from theseus-rs/add-java-25-support
feat: add Java 25 support
2 parents 497438b + 81873a4 commit 898bf41

File tree

26 files changed

+2232
-1999
lines changed

26 files changed

+2232
-1999
lines changed

ristretto_classloader/tests/runtime.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ async fn test_get_runtime_v21() -> Result<()> {
3636
}
3737

3838
#[tokio::test]
39-
async fn test_get_runtime_v24() -> Result<()> {
40-
test_runtime("24.0.2.12.1", "java.lang.Object").await
39+
async fn test_get_runtime_v25() -> Result<()> {
40+
test_runtime("25.0.0.34.1", "java.lang.Object").await
4141
}

ristretto_vm/src/build/intrinsics.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate syn;
33
extern crate walkdir;
44

55
use ristretto_classfile::{
6-
JAVA_8, JAVA_11, JAVA_17, JAVA_21, JAVA_24, Version, VersionSpecification,
6+
JAVA_8, JAVA_11, JAVA_17, JAVA_21, JAVA_25, Version, VersionSpecification,
77
};
88
use std::collections::HashMap;
99
use std::env;
@@ -25,7 +25,7 @@ const JAVA_VERSIONS: [(&str, &Version); 5] = [
2525
("JAVA_11", &JAVA_11),
2626
("JAVA_17", &JAVA_17),
2727
("JAVA_21", &JAVA_21),
28-
("JAVA_24", &JAVA_24),
28+
("JAVA_25", &JAVA_25),
2929
];
3030

3131
/// Returns the Java version based on the provided version string.
@@ -35,7 +35,7 @@ fn parse_java_version(version: &str) -> Version {
3535
"JAVA_11" => JAVA_11,
3636
"JAVA_17" => JAVA_17,
3737
"JAVA_21" => JAVA_21,
38-
"JAVA_24" => JAVA_24,
38+
"JAVA_25" => JAVA_25,
3939
_ => panic!("Unsupported intrinsic method Java version: {version}"),
4040
}
4141
}

0 commit comments

Comments
 (0)