Try to fix Android build issues

.github/workflows/workflow.yml

@@ -470,21 +470,21 @@ jobs:
           restore-keys: |
             android-libs-
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ${{github.workspace}}/attachments/android/.gradle
-            ${{github.workspace}}/attachments/android/app/.cxx
-            ${{github.workspace}}/attachments/android/app/build/intermediates
-            ${{github.workspace}}/attachments/android/app/build/outputs
-            ${{github.workspace}}/attachments/android/app/build/generated
-          key: ${{ runner.os }}-gradle-${{ hashFiles('attachments/android/app/src/main/cpp/CMakeLists.txt', 'attachments/34_android.cpp', 'attachments/35_gltf_ktx.cpp', 'attachments/android/app/build.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-${{ hashFiles('attachments/android/app/src/main/cpp/CMakeLists.txt') }}
-            ${{ runner.os }}-gradle-
+      # - name: Cache Gradle packages
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       ~/.gradle/caches
+      #       ~/.gradle/wrapper
+      #       ${{github.workspace}}/attachments/android/.gradle
+      #       ${{github.workspace}}/attachments/android/app/.cxx
+      #       ${{github.workspace}}/attachments/android/app/build/intermediates
+      #       ${{github.workspace}}/attachments/android/app/build/outputs
+      #       ${{github.workspace}}/attachments/android/app/build/generated
+      #     key: ${{ runner.os }}-gradle-${{ hashFiles('attachments/android/app/src/main/cpp/CMakeLists.txt', 'attachments/34_android.cpp', 'attachments/35_gltf_ktx.cpp', 'attachments/android/app/build.gradle') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-gradle-${{ hashFiles('attachments/android/app/src/main/cpp/CMakeLists.txt') }}
+      #       ${{ runner.os }}-gradle-
 
       - name: Install and configure ccache
         run: |
@@ -569,10 +569,12 @@ jobs:
       - name: Build Android Chapters
         working-directory: ${{github.workspace}}/attachments/android
         run: |
-          if [ ! -f "gradlew" ]; then
-            echo "Generating Gradle wrapper..."
-            gradle wrapper
-          fi
+          unset GRADLE_VERSION
+          which gradle && gradle --version
+          echo "Generating Gradle wrapper..."
+          rm -rf gradle
+          gradle wrapper --gradle-version 8.6 --distribution-type bin
+          ./gradlew --version
 
           SUPPORTED_CHAPTERS=$(grep -A 20 "set(SUPPORTED_CHAPTERS" app/src/main/cpp/CMakeLists.txt | sed -n '/set(SUPPORTED_CHAPTERS/,/)/p' | grep -o '"[^"]*"' | sed 's/"//g')
 

attachments/android/app/build.gradle

@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace "com.vulkan.tutorial"
-    compileSdk 36
+    compileSdk 35
     defaultConfig {
         applicationId "com.vulkan.tutorial"
         minSdk 24
-        targetSdk 36
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 

attachments/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.11.0'
+        classpath 'com.android.tools.build:gradle:8.13.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

attachments/android/gradle.properties

@@ -8,3 +8,6 @@ org.gradle.caching=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.configuration-cache=true
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true

attachments/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Jul 03 10:37:40 PDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-milestone-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists