Update to JDK25 which is LTS

Author: ktoso

.github/actions/prepare_env/action.yml

@@ -12,7 +12,7 @@ runs:
       with:
         distribution: ${{ matrix.jdk_vendor }}
         java-version: |
-          24
+          25
           17
         cache: 'gradle'
     - name: Set JAVA_HOME_{N}
@@ -23,10 +23,10 @@ runs:
         elif [[ -n "$JAVA_HOME_21_ARM64" ]]; then
           echo "JAVA_HOME_21=$JAVA_HOME_21_ARM64" >> $GITHUB_ENV
         fi
-        if [[ -n "$JAVA_HOME_24_X64" ]]; then
-          echo "JAVA_HOME_24=$JAVA_HOME_24_X64" >> $GITHUB_ENV
-        elif [[ -n "$JAVA_HOME_24_ARM64" ]]; then
-          echo "JAVA_HOME_24=$JAVA_HOME_24_ARM64" >> $GITHUB_ENV
+        if [[ -n "$JAVA_HOME_25_X64" ]]; then
+          echo "JAVA_HOME_25=$JAVA_HOME_25_X64" >> $GITHUB_ENV
+        elif [[ -n "$JAVA_HOME_25_ARM64" ]]; then
+          echo "JAVA_HOME_25=$JAVA_HOME_25_ARM64" >> $GITHUB_ENV
         fi
       # - name: Check Java environment
       #  shell: bash

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(24)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 

README.md

@@ -82,9 +82,9 @@ This does require the use of the relatively recent [JEP-454: Foreign Function &
 This is the primary way we envision calling Swift code from server-side Java libraries and applications.
 
 Required language/runtime versions:
-- **Swift 6.1**, because of dependence on rich swift interface files  
-- **JDK 24+** 
-  - We are validating the implementation using the currently supported non-LTE release, which at present means JDK-24.
+- **Swift 6.1**, because of dependence on rich swift interface files
+- **JDK 25+**
+  - We are validating the implementation using the currently supported non-LTE release, which at present means JDK-25.
 
 ## swift-java jextract --mode=jni
 
@@ -104,7 +104,7 @@ This project contains multiple builds, living side by side together.
 
 You will need to have:
 - Swift (6.1.x+)
-- Java (24+ for FFM, even though we support lower JDK targets)
+- Java (25+ for FFM, even though we support lower JDK targets)
 - Gradle (installed by "Gradle wrapper" automatically when you run gradle through `./gradlew`)
 
 ### Preparing your environment
@@ -123,12 +123,12 @@ however any recent enough Java distribution should work correctly. You can use s
 # Install sdkman from: https://sdkman.io
 curl -s "https://get.sdkman.io" | bash
 sdk install java 17.0.15-amzn
-sdk install java 24.0.1-amzn
+sdk install java 25.0.1-amzn
 
-sdk use java 24.0.1-amzn
+sdk use java 25.0.1-amzn
 ```
 
-The use of JDK 24 is required to build the project, even though the libraries being published may target lower Java versions.
+The use of JDK 25 is required to build the project, even though the libraries being published may target lower Java versions.
 
 ❗️ Please make sure to `export JAVA_HOME` such that swift-java can find the necessary java libraries!
 When using sdkman the easiest way to export JAVA_HOME is to export the "current" used JDK's home, like this:

Samples/SwiftAndJavaJarSampleLib/build.gradle

@@ -38,7 +38,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(24))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 

Samples/SwiftAndJavaJarSampleLib/ci-validate.sh

@@ -10,19 +10,19 @@ SWIFT_VERSION="$(swift -version | awk '/Swift version/ { print $3 }')"
 # This is how env variables are set by setup-java
 if [ "$(uname -m)" = 'arm64' ]; then
   ARCH=ARM64
-  JAVAC="${JAVA_HOME_24_ARM64}/bin/javac"
-  JAVA="${JAVA_HOME_24_ARM64}/bin/java"
+  JAVAC="${JAVA_HOME_25_ARM64}/bin/javac"
+  JAVA="${JAVA_HOME_25_ARM64}/bin/java"
 else
   ARCH=X64
-  JAVAC="${JAVA_HOME_24_X64}/bin/javac"
-  JAVA="${JAVA_HOME_24_X64}/bin/java"
+  JAVAC="${JAVA_HOME_25_X64}/bin/javac"
+  JAVA="${JAVA_HOME_25_X64}/bin/java"
 fi
 
-if [ -n "$JAVA_HOME_24_$ARCH" ]; then
-   export JAVA_HOME="$JAVA_HOME_24_$ARCH"
+if [ -n "$JAVA_HOME_25_$ARCH" ]; then
+   export JAVA_HOME="$JAVA_HOME_25_$ARCH"
 elif [ "$(uname -s)" = 'Linux' ]
 then
-  export PATH="${PATH}:/usr/lib/jvm/jdk-24/bin" # we need to make sure to use the latest JDK to actually compile/run the executable
+  export PATH="${PATH}:/usr/lib/jvm/jdk-25/bin" # we need to make sure to use the latest JDK to actually compile/run the executable
 fi
 
 # check if we can compile a plain Example file that uses the generated Java bindings that should be in the generated jar

Samples/SwiftJavaExtractFFMSampleApp/build.gradle

@@ -31,7 +31,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(24))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 

Samples/SwiftJavaExtractJNISampleApp/build.gradle

@@ -32,7 +32,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(24))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 

SwiftKitCore/build.gradle

@@ -43,7 +43,7 @@ publishing {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(24))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 

SwiftKitFFM/build.gradle

@@ -42,7 +42,7 @@ publishing {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(24))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 

docker/Dockerfile

@@ -20,7 +20,7 @@ ENV LANGUAGE=en_US.UTF-8
 
 # JDK dependency
 RUN curl -s "https://get.sdkman.io" | bash
-RUN bash -c "source /root/.sdkman/bin/sdkman-init.sh && sdk install java 24.0.1-amzn"
+RUN bash -c "source /root/.sdkman/bin/sdkman-init.sh && sdk install java 25.0.1-amzn"
 
 RUN curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && \
     tar zxf swiftly-$(uname -m).tar.gz && \