From c019282ffb64ac37c15415d5cdef24f5848fbe7f Mon Sep 17 00:00:00 2001
From: Volodymyr Buberenko <v.buberenko@gmail.com>
Date: Sun, 9 Oct 2022 17:05:43 +0300
Subject: [PATCH 1/2] Add matrix of versions for integration tests, remove java
 step

---
 .../workflows/android_alarm_manager_plus.yaml    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android_alarm_manager_plus.yaml b/.github/workflows/android_alarm_manager_plus.yaml
index b8f4bf0d77..dc7fbcd07f 100644
--- a/.github/workflows/android_alarm_manager_plus.yaml
+++ b/.github/workflows/android_alarm_manager_plus.yaml
@@ -29,7 +29,7 @@ jobs:
       - name: "Install Tools"
         run: ./.github/workflows/scripts/install-tools.sh
 
-      # Required for Android builds
+          # Required for Android builds
       - uses: actions/setup-java@v1
         with:
           java-version: "11"
@@ -40,15 +40,19 @@ jobs:
   android_integration_test:
     runs-on: macos-latest
     timeout-minutes: 30
+    strategy:
+      matrix:
+        android-api-level: [21, 26, 32]
+
     steps:
       - name: "Checkout repository"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: "Install Flutter"
         run: ./.github/workflows/scripts/install-flutter.sh stable
       - name: "Install Tools"
         run: ./.github/workflows/scripts/install-tools.sh
 
-      # Required for Android builds
+          # Required for Android builds
       - uses: actions/setup-java@v1
         with:
           java-version: "11"
@@ -58,8 +62,10 @@ jobs:
       - name: "Android Integration Test"
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 30
-          arch: x86_64
+          api-level: ${{ matrix.android-api-level }}
+          cores: 3
           target: google_apis
+          arch: x86_64
+          force-avd-creation: false
           profile: Nexus 5X
           script: ./.github/workflows/scripts/integration-test.sh android android_alarm_manager_example

From a6e293f2714923ae497f8ae18ccfbfa88ebcc9bb Mon Sep 17 00:00:00 2001
From: Volodymyr Buberenko <v.buberenko@gmail.com>
Date: Sun, 9 Oct 2022 23:13:57 +0300
Subject: [PATCH 2/2] Update setup java and checkout actions

---
 .github/workflows/android_alarm_manager_plus.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android_alarm_manager_plus.yaml b/.github/workflows/android_alarm_manager_plus.yaml
index dc7fbcd07f..10404d1104 100644
--- a/.github/workflows/android_alarm_manager_plus.yaml
+++ b/.github/workflows/android_alarm_manager_plus.yaml
@@ -23,15 +23,16 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: "Checkout repository"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: "Install Flutter"
         run: ./.github/workflows/scripts/install-flutter.sh stable
       - name: "Install Tools"
         run: ./.github/workflows/scripts/install-tools.sh
 
-          # Required for Android builds
-      - uses: actions/setup-java@v1
+        # Required for Android builds
+      - uses: actions/setup-java@v2
         with:
+          distribution: "temurin"
           java-version: "11"
 
       - name: "Build Example"
@@ -52,9 +53,10 @@ jobs:
       - name: "Install Tools"
         run: ./.github/workflows/scripts/install-tools.sh
 
-          # Required for Android builds
-      - uses: actions/setup-java@v1
+        # Required for Android builds
+      - uses: actions/setup-java@v2
         with:
+          distribution: "temurin"
           java-version: "11"
 
       - name: "Bootstrap Workspace"