Skip to content

build: bump JDK 17 to 21 #14806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Stensel8 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

build: bump JDK 17 to 21 #14806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
with:
submodules: true

- name: set up JDK 17
- name: set up JDK 21
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
# gh api repos/actions/setup-java/commits/v5 --jq '.sha'
with:
distribution: temurin
java-version: 17
java-version: '21'
cache: gradle

- name: Validate Gradle Wrapper
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/diffuse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
# gh api repos/actions/setup-java/commits/v5 --jq '.sha'
with:
distribution: temurin
java-version: 17
java-version: '21'
cache: gradle

- name: Install NDK
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ compileSdk = "android-36"
targetSdk = "35"
minSdk = "23"
ndk = "28.0.13004108"
javaVersion = "17"
kotlinJvmTarget = "17"
javaVersion = "21"
kotlinJvmTarget = "21"
gradle = "9.1.1"
kotlin = "2.2.20"
android-gradle-plugin = "9.1.1"
Expand Down
2 changes: 1 addition & 1 deletion reproducible-builds/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 unzip wget

ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip
ENV ANDROID_API_LEVELS android-36
Expand Down