From 986d849721cd27c76ae0a3c9953c48fc47882046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Fri, 3 Feb 2023 18:32:02 +0000
Subject: [PATCH 1/3] Fix redundant space

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ea135eac2..f5f8d95046 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
       if: matrix.java == 11 && matrix.entry.mock-maker == 'mock-maker-default' # SINGLE-MATRIX-JOB
       run: ./gradlew spotlessCheck
 
-    - name: 6. Build on Java ${{ matrix.java }} with ${{ matrix.entry.mock-maker }} and ${{ matrix.entry.member-accessor }} 
+    - name: 6. Build on Java ${{ matrix.java }} with ${{ matrix.entry.mock-maker }} and ${{ matrix.entry.member-accessor }}
       run: ./gradlew build idea --scan
       env:
         MOCK_MAKER: ${{ matrix.entry.mock-maker }}

From ca926c489f23e7712bd51f9d95e89cd35ec51e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Fri, 3 Feb 2023 18:32:46 +0000
Subject: [PATCH 2/3] Remove Java from the matrix, it's not relevant for
 Android.

---
 .github/workflows/ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5f8d95046..e49263c059 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,6 @@ jobs:
     # Definition of the build matrix
     strategy:
       matrix:
-        java: [ 11 ]
         android-api: [ 26 ]
 
     # All build steps
@@ -105,13 +104,13 @@ jobs:
       with:
         fetch-depth: '0' # https://github.com/shipkit/shipkit-changelog#fetch-depth-on-ci
 
-    - name: 2. Set up Java ${{ matrix.java }}
+    - name: 2. Set up Java 11
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: ${{ matrix.java }}
+        java-version: 11
 
-    - name: 3. Run Android tests on Java ${{ matrix.java }} with Android API level ${{ matrix.android-api }}
+    - name: 3. Run Android tests on Android API level ${{ matrix.android-api }}
       uses: reactivecircus/android-emulator-runner@v2
       with:
         arch: x86_64

From 19059e6d7fbe35fa3b42b6f0006109b569849690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Fri, 3 Feb 2023 18:35:43 +0000
Subject: [PATCH 3/3] Add 33 and explicitly list all the combinations

---
 .github/workflows/ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e49263c059..dc1edb0cb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,13 @@ jobs:
     # Definition of the build matrix
     strategy:
       matrix:
-        android-api: [ 26 ]
+        include:
+          # Minimum supported
+          - android-api: 26
+            android-image-type: default
+          # Maximum available
+          - android-api: 33
+            android-image-type: google_apis
 
     # All build steps
     steps:
@@ -115,6 +121,7 @@ jobs:
       with:
         arch: x86_64
         api-level: ${{ matrix.android-api }}
+        target: ${{ matrix.android-image-type }}
         script: ./gradlew :androidTest:connectedCheck --no-daemon --no-build-cache
 
   #