ci: upgrade jdk 11 to 17

NextAlone · Jan 19, 2024 · dafb15c · dafb15c
1 parent 0d99904
commit dafb15c
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 15 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -40,8 +40,14 @@ jobs:
             TMessagesProj/jni/ffmpeg/build
             TMessagesProj/jni/libvpx/build
           key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh', 'TMessagesProj/jni/patches/ffmpeg/*') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -73,8 +79,14 @@ jobs:
           path: |
             TMessagesProj/jni/boringssl/build
           key: ${{ hashFiles('boringssl_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -133,8 +145,14 @@ jobs:
           path: |
             TMessagesProj/jni/boringssl/build
           key: ${{ hashFiles('boringssl_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -170,8 +188,14 @@ jobs:
           path: |
             TMessagesProj/libs/libv2ray.aar
           key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -205,8 +229,14 @@ jobs:
           path: |
             TMessagesProj/libs/ss-rust-release.aar
           key: ${{ hashFiles('shadowsocks_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -238,8 +268,14 @@ jobs:
           path: |
             TMessagesProj/libs/ssr-libev-release.aar
           key: ${{ hashFiles('shadowsocksr_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -267,8 +303,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
       - name: Install NDK
         run: |
           echo "y" | sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,8 +43,14 @@ jobs:
             TMessagesProj/jni/ffmpeg/build
             TMessagesProj/jni/libvpx/build
           key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh', 'TMessagesProj/jni/patches/ffmpeg/*') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -76,8 +82,14 @@ jobs:
           path: |
             TMessagesProj/jni/boringssl/build
           key: ${{ hashFiles('boringssl_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -136,8 +148,14 @@ jobs:
           path: |
             TMessagesProj/jni/boringssl/build
           key: ${{ hashFiles('boringssl_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -173,8 +191,14 @@ jobs:
           path: |
             TMessagesProj/libs/libv2ray.aar
           key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -208,8 +232,14 @@ jobs:
           path: |
             TMessagesProj/libs/ss-rust-release.aar
           key: ${{ hashFiles('shadowsocks_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -241,8 +271,14 @@ jobs:
           path: |
             TMessagesProj/libs/ssr-libev-release.aar
           key: ${{ hashFiles('shadowsocksr_status') }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         if: steps.cache.outputs.cache-hit != 'true'
       - name: Install NDK
         if: steps.cache.outputs.cache-hit != 'true'
@@ -271,8 +307,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
       - name: Install NDK
         run: |
           echo "y" | sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -36325,7 +36325,7 @@ private void nkbtn_onclick_actionbar(int id) {
                 return;
             Bundle args = new Bundle();
             args.putLong("chat_id", chatInfo.id);
-            args.putInt("message_id", threadMessageId);
+            args.putLong("message_id", threadMessageId);
             if (!getMessagesController().checkCanOpenChat(args, ChatActivity.this))
                 return;
             presentFragment(new ChatActivity(args), true);