[GR-65173] Update to ProGuard that supports JDK 24

mur47x111 · mur47x111 · commit 8b5617db24bd · 2025-06-13T21:47:54.000Z
PullRequest: graal/20894
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -217,15 +217,19 @@ local common_json = import "../common.json";
       }
     },
 
-    local code_tools = {
+    # ProGuard does not yet run on JDK 25
+    proguard: {
       downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
-        TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
+        TOOLS_JAVA_HOME: jdks_data['oraclejdk24'],
+        IGV_JAVA_HOME: jdks_data['oraclejdk21'],
       } else {},
     },
-    # GR-46676: ProGuard does not yet run on JDK 22
-    proguard: code_tools,
     # GR-49566: SpotBugs does not yet run on JDK 22
-    spotbugs: code_tools,
+    spotbugs: {
+      downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
+        TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
+      } else {},
+    },
 
     sulong:: self.cmake + {
       packages+: if self.os == "windows" then {
diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.54.6",
+  "mx_version": "7.55.2",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion": "7.33.0",
+  "mxversion": "7.55.2",
   "name" : "compiler",
   "sourceinprojectwhitelist" : [],
 
diff --git a/espresso-shared/mx.espresso-shared/suite.py b/espresso-shared/mx.espresso-shared/suite.py
@@ -23,7 +23,7 @@
 # questions.
 #
 suite = {
-    "mxversion": "7.38.0",
+    "mxversion": "7.55.2",
     "name": "espresso-shared",
     "version" : "26.0.0",
     "release" : False,
diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
@@ -22,7 +22,7 @@
 #
 
 suite = {
-    "mxversion": "7.46.0",
+    "mxversion": "7.55.2",
     "name": "espresso",
     "version" : "26.0.0",
     "release" : False,
diff --git a/regex/mx.regex/suite.py b/regex/mx.regex/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.33.0",
+  "mxversion": "7.55.2",
 
   "name" : "regex",
 
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.54.5",
+  "mxversion": "7.55.2",
   "name" : "sdk",
   "version" : "26.0.0",
   "release" : False,
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1,6 +1,6 @@
 # pylint: disable=line-too-long
 suite = {
-    "mxversion": "7.38.0",
+    "mxversion": "7.55.2",
     "name": "substratevm",
     "version" : "26.0.0",
     "release" : False,
diff --git a/sulong/mx.sulong/suite.py b/sulong/mx.sulong/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion": "7.48.0",
+  "mxversion": "7.55.2",
   "name" : "sulong",
   "version" : "26.0.0",
   "release" : False,
diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
@@ -21,7 +21,7 @@
 # questions.
 #
 suite = {
-    "mxversion": "7.33.0",
+    "mxversion": "7.55.2",
     "name": "tools",
     "defaultLicense" : "GPLv2-CPE",
 
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.33.0",
+  "mxversion": "7.55.2",
   "name" : "truffle",
   "version" : "26.0.0",
   "release" : False,
diff --git a/visualizer/mx.visualizer/suite.py b/visualizer/mx.visualizer/suite.py
@@ -21,7 +21,7 @@
 # questions.
 
 suite = {
-  "mxversion": "7.33.0",
+  "mxversion": "7.55.2",
   "name" : "visualizer",
 
 
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -1,7 +1,7 @@
 suite = {
     "name": "vm",
     "version" : "26.0.0",
-    "mxversion": "7.34.1",
+    "mxversion": "7.55.2",
     "release" : False,
     "groupId" : "org.graalvm",
 
diff --git a/wasm/mx.wasm/suite.py b/wasm/mx.wasm/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.33.0",
+  "mxversion": "7.55.2",
   "name" : "wasm",
   "groupId" : "org.graalvm.wasm",
   "version" : "26.0.0",
diff --git a/web-image/mx.web-image/suite.py b/web-image/mx.web-image/suite.py
@@ -1,5 +1,5 @@
 suite = {
-    "mxversion": "7.33.0",
+    "mxversion": "7.55.2",
     "name": "web-image",
     "versionConflictResolution": "latest",
     "version": "1.0",

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`# questions.`
`24`	`24`	`#`
`25`	`25`	`suite = {`
`26`		`- "mxversion": "7.38.0",`
	`26`	`+ "mxversion": "7.55.2",`
`27`	`27`	`"name": "espresso-shared",`
`28`	`28`	`"version" : "26.0.0",`
`29`	`29`	`"release" : False,`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`#`
`23`	`23`
`24`	`24`	`suite = {`
`25`		`- "mxversion": "7.46.0",`
	`25`	`+ "mxversion": "7.55.2",`
`26`	`26`	`"name": "espresso",`
`27`	`27`	`"version" : "26.0.0",`
`28`	`28`	`"release" : False,`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`# SOFTWARE.`
`40`	`40`	`#`
`41`	`41`	`suite = {`
`42`		`- "mxversion": "7.33.0",`
	`42`	`+ "mxversion": "7.55.2",`
`43`	`43`
`44`	`44`	`"name" : "regex",`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`# questions.`
`22`	`22`	`#`
`23`	`23`	`suite = {`
`24`		`- "mxversion": "7.33.0",`
	`24`	`+ "mxversion": "7.55.2",`
`25`	`25`	`"name": "tools",`
`26`	`26`	`"defaultLicense" : "GPLv2-CPE",`
`27`	`27`