Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-12 11:37:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump java and kotlin target to JDK 21.

Browse Source
This commit is contained in:
Cody Henthorne
2026-07-01 15:10:24 -04:00
committed by Michelle Tang
parent 4a0325ea55
commit 1ee4c590b7
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/android.yml
+2 -2
View File
@@ -22,12 +22,12 @@ jobs:
submodules: true
lfs: true
- name: set up JDK 17
- name: set up JDK 21
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
# gh api repos/actions/setup-java/commits/v5 --jq '.sha'
with:
distribution: temurin
java-version: 17
java-version: 21
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
.github/workflows/diffuse.yml
+2 -2
View File
@@ -22,12 +22,12 @@ jobs:
submodules: true
ref: ${{ github.event.pull_request.base.sha }}
- name: set up JDK 17
- name: set up JDK 21
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
# gh api repos/actions/setup-java/commits/v5 --jq '.sha'
with:
distribution: temurin
java-version: 17
java-version: 21
- name: Set up Gradle
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
.tool-versions
+1 -1
View File
@@ -1,2 +1,2 @@
java openjdk-17.0.2
java openjdk-21.0.2
uv latest
gradle/libs.versions.toml
+2 -2
View File
@@ -8,8 +8,8 @@ compileSdk = "android-36.1"
targetSdk = "35"
minSdk = "23"
ndk = "28.0.13004108"
javaVersion = "17"
kotlinJvmTarget = "17"
javaVersion = "21"
kotlinJvmTarget = "21"
gradle = "9.2.1"
kotlin = "2.2.20"
android-gradle-plugin = "9.2.1"
reproducible-builds/Dockerfile
+2 -2
View File
@@ -12,7 +12,7 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates
# Back to normal, verification back on
RUN apt update
RUN apt install -y git openjdk-17-jdk unzip wget
RUN apt install -y git openjdk-21-jdk-headless unzip wget
ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME=commandlinetools-linux-10406996_latest.zip
ENV ANDROID_COMMAND_LINE_TOOLS_SHA256=8919e8752979db73d8321e9babe2caedcc393750817c1a5f56c128ec442fb540
@@ -31,7 +31,7 @@ RUN unzip ${ANDROID_COMMAND_LINE_TOOLS_FILENAME} -d /usr/local/android-sdk-linux
RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}
RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services" "ndk;28.0.13004108" "cmake;3.22.1"
RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platform-tools" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services" "ndk;28.0.13004108" "cmake;3.22.1"
RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"