From 4bca5c81673c68305c2bcb5be16ae0a2961701e6 Mon Sep 17 00:00:00 2001
From: scarf <greenscarf005@gmail.com>
Date: Wed, 29 Mar 2023 01:04:39 +0900
Subject: [PATCH] ci: bumb android jdk to 17

---
 .github/workflows/android.yml        | 10 +++++-----
 .github/workflows/manual-release.yml |  6 +++---
 .github/workflows/release.yml        |  4 ++--
 doc/COMPILING/COMPILING.md           |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0ef5d9d94dd9..a499b9981de4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -30,16 +30,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
 
-    - name: Set up JDK 8 (android)
-      uses: actions/setup-java@v2
+    - name: Set up JDK 17 (android)
+      uses: actions/setup-java@v3
       with:
-        java-version: "8"
+        java-version: "17"
         distribution: "adopt"
-    
+
     - name: Setup build and dependencies
       run: |
         sudo apt-get update
diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
index e8fcbc77d5cb..8565adf1ec19 100644
--- a/.github/workflows/manual-release.yml
+++ b/.github/workflows/manual-release.yml
@@ -248,11 +248,11 @@ jobs:
         run: |
           make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=10.12 PCH=0 dmgdist COMPILER=clang++
           mv CataclysmBN-${{ inputs.version }}.dmg cbn-${{ matrix.artifact }}-${{ inputs.version }}.dmg
-      - name: Set up JDK 8 (android)
+      - name: Set up JDK 17 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: "8"
+          java-version: "17"
           distribution: "adopt"
       - name: Setup Build and Dependencies (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ef42110359d9..2a663eb71e90 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -243,11 +243,11 @@ jobs:
         run: |
           make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=10.12 PCH=0 dmgdist COMPILER=clang++
           mv CataclysmBN-unstable.dmg cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
-      - name: Set up JDK 8 (android)
+      - name: Set up JDK 17 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
         uses: actions/setup-java@v2
         with:
-          java-version: "8"
+          java-version: "17"
           distribution: "adopt"
       - name: Setup Build and Dependencies (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
diff --git a/doc/COMPILING/COMPILING.md b/doc/COMPILING/COMPILING.md
index 533a473db550..03d9b6722690 100644
--- a/doc/COMPILING/COMPILING.md
+++ b/doc/COMPILING/COMPILING.md
@@ -342,7 +342,7 @@ The Gradle project lives in the repository under `android/`. You can build it vi
 
 ### Dependencies
 
-  * Java JDK 8
+  * Java JDK 17
   * SDL2 (tested with 2.0.8, though a custom fork is recommended with project-specific bugfixes)
   * SDL2_ttf (tested with 2.0.14)
   * SDL2_mixer (tested with 2.0.2)
@@ -354,7 +354,7 @@ The Gradle build process automatically installs dependencies from [deps.zip](and
 
 Install Linux dependencies. For a desktop Ubuntu installation:
 
-    sudo apt-get install openjdk-8-jdk-headless
+    sudo apt-get install openjdk-17-jdk-headless
 
 Install Android SDK and NDK: