Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }}
strategy:
matrix:
java: [17, 21]
java: [17, 21, 25]
os: [ubuntu-latest]
steps:
- name: Checkout
Expand Down
5 changes: 3 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
let
base = rec {
jdk =
if javaVersion <= 23 then prev."jdk${toString javaVersion}"
if javaVersion <= 25 then prev."jdk${toString javaVersion}"
else abort "Not set up yet :)";
maven = prev.maven.override { jdk_headless = jdk; };
};
Expand Down Expand Up @@ -187,7 +187,8 @@
default = jdk17;
jdk17 = mkShell system { javaVersion = 17; };
jdk21 = mkShell system { javaVersion = 21; };
extraChecks = mkShell system { extraChecks = true; javaVersion = 23; };
jdk25 = mkShell system { javaVersion = 25; };
extraChecks = mkShell system { extraChecks = true; javaVersion = 25; };
jReleaser = mkShell system { release = true; javaVersion = 21; };
});
in
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/spoon/test/ctClass/CtClassTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ void testLocalClassExists() {
}

@ExtendWith(LineSeparatorExtension.class)
@ModelTest(value = {"src/test/resources/ctClass/Main.java"}, complianceLevel = 25)
@ModelTest(value = {"src/test/resources/ctClass/Main.java"}, complianceLevel = 25, noClasspath = false)
public void testCompactSourceFilesAndInstanceMainMethods(@BySimpleName("Main") CtClass<?> cl) {
// contract: Java 25 supports compact source files and instance main methods
assertThat(cl).getSimpleName().isEqualTo("Main");
Expand Down Expand Up @@ -464,7 +464,7 @@ public Person(java.lang.String name) {
}

void main() {
IO.println(greeting());
java.lang.System.out.println(greeting());
}

java.lang.String greeting() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/ctClass/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public Person(String name) {
}

void main() {
IO.println(greeting());
System.out.println(greeting());
}

String greeting() {
Expand Down
Loading