add support for java 21

faberNovel · Mar 5, 2025 · 863623d · 863623d
1 parent 9865d03
commit 863623d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ ENV LANG=en_US.UTF-8
 
 ## Install dependencies
 RUN apt-get update && apt-get install --no-install-recommends -y \
+  openjdk-21-jdk \  
   openjdk-17-jdk \
   openjdk-11-jdk \
   openjdk-8-jdk \
@@ -51,6 +52,7 @@ ENV JDK_ROOT "/usr/lib/jvm/"
 RUN jenv add ${JDK_ROOT}/java-8-openjdk-amd64
 RUN jenv add ${JDK_ROOT}/java-11-openjdk-amd64
 RUN jenv add ${JDK_ROOT}/java-17-openjdk-amd64
+RUN jenv add ${JDK_ROOT}/java-21-openjdk-amd64
 RUN echo 'export PATH="$JENV_ROOT/bin:$PATH"' >> ~/.bashrc
 RUN echo 'eval "$(jenv init -)"' >> ~/.bashrc
 

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -56,9 +56,9 @@ if [ "$gcloud" = true ]; then
 fi
 
 # Setup test app environment variables
-export KOTLIN_VERSION="1.9.10"
-export GRADLE_VERSION="8.3"
-export ANDROID_GRADLE_TOOLS_VERSION="8.1.1"
+export KOTLIN_VERSION="2.1.10"
+export GRADLE_VERSION="8.10"
+export ANDROID_GRADLE_TOOLS_VERSION="8.7.3"
 export COMPILE_SDK_VERSION="$android_api"
 export BUILD_TOOLS_VERSION="$android_build_tools"
 export MIN_SDK_VERSION=21
@@ -87,7 +87,7 @@ exec_test() {
 ruby -v
 eval "$(jenv init -)"
 
-jenv global 17
+jenv global 21
 if [ "$android_ndk" = true ]; then
   echo "Running tests with ndk"
   exec_test "$script_path"/test-app-ndk

diff --git a/tests/test-app/app/build.gradle b/tests/test-app/app/build.gradle
@@ -28,11 +28,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 
 }