Use Java 21 and ensure AVD cache in ci.yml

Author: alexstyl

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
 
 permissions:
@@ -49,14 +49,14 @@ jobs:
     needs: build
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - uses: actions/cache@v4
         with:
@@ -76,51 +76,66 @@ jobs:
         run: ./gradlew --no-daemon --console=plain jvmTest
 
   android-tests:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Gradle cache
-        uses: gradle/actions/setup-gradle@v4
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/gradle-wrapper.properties', '**/*.gradle*', '**/gradle.properties') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: build-outputs
-
-      - name: Enable Hardware Acceleration
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: AVD cache
-        uses: actions/cache@v4
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-25-no-options
-
-      - name: Android Tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: 23
-          profile: 'pixel_4'
-          arch: 'x86_64'
-          script: ./gradlew connectedAndroidTest
+     needs: build
+     runs-on: ubuntu-latest
+     timeout-minutes: 60
+     env:
+       API_LEVEL: 23
+       ARCH: x86_64
+       DISK_SIZE: 2048M
+     strategy:
+       matrix:
+         module: [ primitives, theming, platformtheme ]
+     steps:
+       - name: Enable Hardware Acceleration
+         run: |
+           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+           sudo udevadm control --reload-rules
+           sudo udevadm trigger --name-match=kvm
+
+       - uses: actions/setup-java@v4
+         with:
+           distribution: temurin
+           java-version: 21
+
+       - name: Gradle cache
+         uses: gradle/actions/setup-gradle@v4
+
+       - name: Restore AVD
+         uses: actions/cache@v4
+         id: avd-cache
+         with:
+           path: |
+             ~/.android/avd/*
+             ~/.android/adb*
+           key: avd-${{ env.API_LEVEL }}-${{ env.ARCH }}-${{ env.DISK_SIZE }}
+
+       - uses: actions/checkout@v4
+
+       - name: Download build artifacts
+         uses: actions/download-artifact@v4
+         with:
+           name: build-outputs
+
+       - name: Create AVD
+         if: steps.avd-cache.outputs.cache-hit != 'true'
+         uses: reactivecircus/android-emulator-runner@v2
+         with:
+           api-level: ${{ env.API_LEVEL }}
+           arch: ${{ env.ARCH }}
+           disk-size: ${{ env.DISK_SIZE }}
+           force-avd-creation: false
+           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+           disable-animations: false
+           script: echo "Generated AVD snapshot for caching."
+
+       - name: Android Tests
+         uses: reactivecircus/android-emulator-runner@v2
+         with:
+           api-level: ${{ env.API_LEVEL }}
+           arch: ${{ env.ARCH }}
+           disk-size: ${{ env.DISK_SIZE }}
+           force-avd-creation: false
+           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+           disable-animations: true
+           script: ./gradlew composeunstyled-${{ matrix.module }}:connectedDebugAndroidTest