From af7ac030291445cb916a2992c642e8a6811013d8 Mon Sep 17 00:00:00 2001
From: Leo Romanovsky <leoromanovsky@gmail.com>
Date: Sat, 21 Oct 2023 14:47:20 -0700
Subject: [PATCH] api version 33; x86_64, google_apis

---
 .github/workflows/publish-sdk.yaml |  3 ---
 .github/workflows/test-sdk.yaml    | 27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/publish-sdk.yaml b/.github/workflows/publish-sdk.yaml
index 14dd5b85..865ac75a 100644
--- a/.github/workflows/publish-sdk.yaml
+++ b/.github/workflows/publish-sdk.yaml
@@ -3,9 +3,6 @@ on:
   release:
     types: [published]
 
-env:
-  ANDROID_API_LEVEL: 33
-
 jobs:
   lint-test-sdk:
     runs-on: macos-latest
diff --git a/.github/workflows/test-sdk.yaml b/.github/workflows/test-sdk.yaml
index cc7cc5c9..302b8f53 100644
--- a/.github/workflows/test-sdk.yaml
+++ b/.github/workflows/test-sdk.yaml
@@ -11,21 +11,22 @@ on:
 jobs:
   test-android-sdk:
     runs-on: macos-latest
-    env:
-      ANDROID_API_LEVEL: 30
+    strategy:
+      matrix:
+        api-level: [ 33 ]
     steps:
       - name: Check out Android SDK
         uses: actions/checkout@v3
-        with:
-          repository: 'Eppo-exp/android-sdk'
 
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'
+
       - name: 'Set up GCP SDK'
         uses: 'google-github-actions/setup-gcloud@v0'
+
       - name: Restore gradle.properties
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} #TODO: populate
@@ -47,27 +48,29 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd
+          key: avd-${{ matrix.api-level }}
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 30
+          api-level: ${{ matrix.api-level }}
+          profile: Nexus 6
           target: google_apis
-          arch: x86
+          arch: x86_64
           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: Run tests on emulator
-        uses: ReactiveCircus/android-emulator-runner@v2
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 30
+          api-level: ${{ matrix.api-level }}
+          profile: Nexus 6
           target: google_apis
-          arch: x86
+          arch: x86_64
           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: make test
+          script: ./gradlew connectedCheck