From e3c717205dce28d649c5a9862a5866a411fbe44a Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Mon, 27 May 2024 19:14:09 -0400 Subject: [PATCH] Upgrade to newer ECJ release The `versionCatalogUpdate` task found this upgrade opportunity, but we also needed to suppress a resource-leak diagnostic that the newer ECJ produces for some of our `JarFile`-manipulating code. --- .../src/main/java/com/ibm/wala/ipa/callgraph/AnalysisScope.java | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/ibm/wala/ipa/callgraph/AnalysisScope.java b/core/src/main/java/com/ibm/wala/ipa/callgraph/AnalysisScope.java index b3e740925f..eae8101887 100644 --- a/core/src/main/java/com/ibm/wala/ipa/callgraph/AnalysisScope.java +++ b/core/src/main/java/com/ibm/wala/ipa/callgraph/AnalysisScope.java @@ -415,6 +415,7 @@ public ArrayClassLoader getArrayClassLoader() { /** * @return the rt.jar (1.4), core.jar (1.5), java.core.jmod (13) file, or null if not found. */ + @SuppressWarnings("resource") private JarFile getRtJar() { return RtJar.getRtJar( new MapIterator<>( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 112658ffcb..86b47885f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ assertj-core = "org.assertj:assertj-core:3.26.0" commons-cli = "commons-cli:commons-cli:1.8.0" commons-io = "commons-io:commons-io:2.16.1" dexlib2 = "org.smali:dexlib2:2.5.2" -eclipse-ecj = "org.eclipse.jdt:ecj:3.21.0" +eclipse-ecj = "org.eclipse.jdt:ecj:3.37.0" eclipse-osgi = "org.eclipse.platform:org.eclipse.osgi:3.19.0" eclipse-wst-jsdt-core = { module = "org.eclipse.wst.jsdt:core", version.ref = "eclipse-wst-jsdt" } eclipse-wst-jsdt-ui = { module = "org.eclipse.wst.jsdt:ui", version.ref = "eclipse-wst-jsdt" }