From 0e221972b638a5c061330e676460f59dd9f1148f Mon Sep 17 00:00:00 2001
From: Hammed Abass <abasshammedola@gmail.com>
Date: Tue, 16 Jun 2026 13:37:37 +0200
Subject: [PATCH 1/2] Fix Android emulator smoke runner

---
 .github/workflows/ci.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14c0d1f..f4722a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
 
   android-emulator:
     name: Android Emulator Smoke
-    runs-on: macos-latest
+    runs-on: macos-13
     if: ${{ github.event_name == 'workflow_dispatch' }}
     timeout-minutes: 25
     concurrency:
@@ -129,12 +129,16 @@ jobs:
         if: ${{ steps.gradle-wrapper.outputs.available == 'true' }}
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 35
+          api-level: 30
           target: google_apis
-          arch: arm64-v8a
-          emulator-boot-timeout: 300
+          arch: x86_64
+          profile: pixel_2
+          emulator-boot-timeout: 180
+          emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -no-metrics
           working-directory: android
-          script: ./gradlew connectedDebugAndroidTest
+          script: |
+            adb devices -l
+            ./gradlew connectedDebugAndroidTest
 
       - name: Skip emulator smoke tests
         if: ${{ steps.gradle-wrapper.outputs.available != 'true' }}

From c89ebb8b3a814a16db43ee326d1a85f17a132a9c Mon Sep 17 00:00:00 2001
From: Hammed Abass <abasshammedola@gmail.com>
Date: Tue, 16 Jun 2026 16:46:35 +0200
Subject: [PATCH 2/2] Use compatible AndroidX dependencies

---
 android/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 4d728a9..f8a01d9 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -37,9 +37,9 @@ kotlin {
 
 dependencies {
 
-    implementation("androidx.core:core-ktx:1.19.0")
-    implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("com.google.android.material:material:1.14.0")
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.activity:activity-ktx:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
     testImplementation("junit:junit:4.13.2")
     testImplementation("org.json:json:20240303")
     androidTestImplementation("androidx.test.ext:junit:1.3.0")