diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3be5870de..a8aa897a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ kaml = { module = "com.charleskorn.kaml:kaml", version = "0.65.0" } junit = { module = "junit:junit", version = "4.13.2" } mockito = { module = "org.mockito:mockito-core", version = "4.11.0" } antlr = { module = "org.antlr:antlr4", version = "4.7.2" } -eclipseJDT = { module = "org.eclipse.jdt:org.eclipse.jdt.core", version = "3.40.0" } +eclipseJDT = { module = "org.eclipse.jdt:org.eclipse.jdt.core", version = "3.16.0" } classpathExplorer = { module = "com.google.classpath-explorer:classpath-explorer", version = "1.0" } netbeansSwing = { module = "org.netbeans.api:org-netbeans-swing-outline", version = "RELEASE210" } ant = { module = "org.apache.ant:ant", version = "1.10.14" } diff --git a/java/src/processing/mode/java/RuntimePathBuilder.java b/java/src/processing/mode/java/RuntimePathBuilder.java index 33e8f209c..f60471e0a 100644 --- a/java/src/processing/mode/java/RuntimePathBuilder.java +++ b/java/src/processing/mode/java/RuntimePathBuilder.java @@ -36,11 +36,7 @@ import java.util.stream.Stream; import com.google.classpath.ClassPathFactory; -import processing.app.Library; -import processing.app.Messages; -import processing.app.Sketch; -import processing.app.SketchException; -import processing.app.Util; +import processing.app.*; import processing.mode.java.preproc.ImportStatement; @@ -576,7 +572,7 @@ public class RuntimePathBuilder { */ protected String findFullyQualifiedJarName(String jarName) { StringJoiner joiner = new StringJoiner(File.separator); - joiner.add(System.getProperty("java.home")); + joiner.add(Platform.getJavaHome().getAbsolutePath()); joiner.add("lib"); joiner.add(jarName); @@ -592,7 +588,7 @@ public class RuntimePathBuilder { */ protected String buildForModule(String moduleName) { StringJoiner jmodPathJoiner = new StringJoiner(File.separator); - jmodPathJoiner.add(System.getProperty("java.home")); + jmodPathJoiner.add(Platform.getJavaHome().getAbsolutePath()); jmodPathJoiner.add("jmods"); jmodPathJoiner.add(moduleName); return jmodPathJoiner.toString();