Skip to content

Revert Java 25-EA kotlin workaround #9499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Revert Java 25-EA kotlin workaround #9499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 5 additions & 23 deletions dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,29 +436,11 @@ public static Class<?> compileAndLoad(
String compilerOutputDir = "/tmp/" + CapturedSnapshotTest.class.getSimpleName() + "-kotlin";
args.setDestination(compilerOutputDir);
args.setClasspath(System.getProperty("java.class.path"));
// We are currently testing JDK 25-ea, which is not yet generally available. This is causing
// Kotlin compilation issues for "25-ea" and "25". Temporarily override java.version "25-ea"
// to be the latest generally available JDK version "24".
// TODO: Revert this change once JDK 25 is generally available and tested.
String originalJavaVersion = System.getProperty("java.version");
boolean overrideEAJavaVersion =
originalJavaVersion != null && originalJavaVersion.contains("-ea");
ExitCode exitCode;
try {
if (overrideEAJavaVersion) {
System.setProperty("java.version", "24");
}
exitCode =
compiler.execImpl(
new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
Services.EMPTY,
args);
} finally {
// Restore the original java.version if it was overridden (25-ea)
if (overrideEAJavaVersion) {
System.setProperty("java.version", originalJavaVersion);
}
}
ExitCode exitCode =
compiler.execImpl(
new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
Services.EMPTY,
args);

if (exitCode.getCode() != 0) {
throw new RuntimeException("Kotlin compilation failed");
Expand Down
Loading