Support JDK 24

.github/workflows/continuous-integration.yml

@@ -27,7 +27,7 @@ jobs:
           - os: ubuntu-latest
             java: 21
           - os: ubuntu-latest
-            java: 23
+            java: 24
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'temurin'
+          distribution: 'zulu'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Build and test using Gradle with ECJ
@@ -73,7 +73,7 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'wala/WALA' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     env:
-      JDK_VERSION: 23
+      JDK_VERSION: 24
     steps:
       - name: 'Check out repository'
         uses: actions/checkout@v4

build-logic/src/main/kotlin/com/ibm/wala/gradle/java.gradle.kts

@@ -3,6 +3,7 @@ package com.ibm.wala.gradle
 // Build configuration for subprojects that include Java source code.
 
 import net.ltgt.gradle.errorprone.errorprone
+import org.gradle.jvm.toolchain.JvmVendorSpec
 
 plugins {
   eclipse
@@ -25,6 +26,9 @@ repositories {
 
 java.toolchain.languageVersion =
     JavaLanguageVersion.of(property("com.ibm.wala.jdk-version") as String)
+// We prefer a toolchain that includes jmod files for the Java standard library, like Azul Zulu.
+// Temurin does not include jmod files as of their JDK 24 builds.
+java.toolchain.vendor = JvmVendorSpec.AZUL
 
 base.archivesName = "com.ibm.wala${path.replace(':', '.')}"
 

gradle/libs.versions.toml

@@ -23,7 +23,7 @@ gradle-goomph-plugin = "com.diffplug.gradle:goomph:3.44.0"
 gradle-maven-publish-plugin = "com.vanniktech:gradle-maven-publish-plugin:0.29.0"
 gradle-spotless-plugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 gson = "com.google.code.gson:gson:2.11.0"
-guava = "com.google.guava:guava:33.4.5-jre"
+guava = "com.google.guava:guava:33.4.8-jre"
 hamcrest = "org.hamcrest:hamcrest:2.2"
 htmlparser = "nu.validator.htmlparser:htmlparser:1.4"
 java_cup = "java_cup:java_cup:0.9e"

shrike/src/main/java/com/ibm/wala/shrike/shrikeCT/ClassReader.java

@@ -67,8 +67,8 @@ private void parse() throws InvalidClassFileException {
     if (magic != MAGIC) {
       throw new InvalidClassFileException(offset, "bad magic number: " + magic);
     }
-    // Support class files up through JDK 23 (version 67)
-    if (majorVersion < 45 || majorVersion > 67) {
+    // Support class files up through JDK 24 (version 68)
+    if (majorVersion < 45 || majorVersion > 68) {
       throw new InvalidClassFileException(
           offset, "unknown class file version: " + majorVersion + '.' + minorVersion);
     }