From 8605539c2ef78b38e9737d58b03b0138984a684f Mon Sep 17 00:00:00 2001
From: Milad Rahimi <info@miladrahimi.com>
Date: Mon, 12 Aug 2024 18:14:45 +0200
Subject: [PATCH 1/4] ci

---
 .github/workflows/android-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android-tests.yml b/.github/workflows/android-tests.yml
index 144b19a..3461ff9 100644
--- a/.github/workflows/android-tests.yml
+++ b/.github/workflows/android-tests.yml
@@ -3,10 +3,10 @@ name: Android CI
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   build:

From a644d1725c50990921f26b3879e8c834687a1716 Mon Sep 17 00:00:00 2001
From: Milad Rahimi <info@miladrahimi.com>
Date: Mon, 12 Aug 2024 18:16:46 +0200
Subject: [PATCH 2/4] ci

---
 .github/workflows/android-tests.yml | 2 +-
 gradlew                             | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 gradlew

diff --git a/.github/workflows/android-tests.yml b/.github/workflows/android-tests.yml
index 3461ff9..736fc22 100644
--- a/.github/workflows/android-tests.yml
+++ b/.github/workflows/android-tests.yml
@@ -40,7 +40,7 @@ jobs:
           components: platform-tools
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: chmod +x gradlew && ./gradlew build
 
       - name: Run tests
         run: ./gradlew test
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From dd0613d173d046dcdab34661e863acb53038708b Mon Sep 17 00:00:00 2001
From: Milad Rahimi <info@miladrahimi.com>
Date: Mon, 12 Aug 2024 18:26:30 +0200
Subject: [PATCH 3/4] ci

---
 .github/workflows/android-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android-tests.yml b/.github/workflows/android-tests.yml
index 736fc22..5976862 100644
--- a/.github/workflows/android-tests.yml
+++ b/.github/workflows/android-tests.yml
@@ -14,13 +14,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Cache Gradle packages
         uses: actions/cache@v3

From 792f0af3b4f2548f4f8cdbddbc754dfebec82e67 Mon Sep 17 00:00:00 2001
From: Milad Rahimi <info@miladrahimi.com>
Date: Tue, 20 Aug 2024 17:48:38 +0200
Subject: [PATCH 4/4] ci

---
 .github/workflows/android-tests.yml | 36 ++++++++++-------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/android-tests.yml b/.github/workflows/android-tests.yml
index 5976862..049b934 100644
--- a/.github/workflows/android-tests.yml
+++ b/.github/workflows/android-tests.yml
@@ -10,37 +10,25 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: '17'
+          distribution: 'temurin'
+          java-version: '21'
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
-      - name: Set up Android SDK
-        uses: android-actions/setup-android@v2
+      - name: Run connected tests
+        uses: ReactiveCircus/android-emulator-runner@v2
         with:
-          api-level: 31
-          build-tools-version: 31.0.0
-          components: platform-tools
-
-      - name: Build with Gradle
-        run: chmod +x gradlew && ./gradlew build
-
-      - name: Run tests
-        run: ./gradlew test
+          api-level: 30
+          target: google_apis
+          arch: x86_64
+          script: ./gradlew connectedCheck