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.7-jre"
 hamcrest = "org.hamcrest:hamcrest:2.2"
 htmlparser = "nu.validator.htmlparser:htmlparser:1.4"
 java_cup = "java_cup:java_cup:0.9e"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionSha256Sum=c9fefec1c0f508a2aa7365cb3e231110f16a7c478177a354ec2e11637fbaa422
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-rc-1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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);
     }