From 04dc9435fc6c5deed80a9927b226a41efef17d58 Mon Sep 17 00:00:00 2001
From: jason <lemnik@users.noreply.github.com>
Date: Wed, 24 Apr 2024 13:36:55 +0100
Subject: [PATCH] chore(build): update Java version to 17 in GitHub Actions

---
 .github/workflows/build.yml                            | 10 ++++++----
 .../java/com/bugsnag/android/MemoryTrimTest.java       |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 966414a05a..265bf47666 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,13 +8,13 @@ env:
 
 jobs:
   android:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: true
       matrix:
         api-level:
-          - 29
+          - 33
 
     steps:
       - uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Gradle cache
         uses: gradle/gradle-build-action@v2
@@ -34,15 +34,17 @@ jobs:
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
+          arch: x86_64
           api-level: ${{ matrix.api-level }}
           force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-options: -no-window -noaudio -no-boot-anim -camera-back none -feature -Vulkan
           disable-animations: false
           script: echo "Generated AVD snapshot for caching."
 
       - name: Run Tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
+          arch: x86_64
           api-level: ${{ matrix.api-level }}
           script: ./gradlew connectedCheck -x :bugsnag-benchmarks:connectedCheck
         env:
diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MemoryTrimTest.java b/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MemoryTrimTest.java
index 8d8799b65d..838f1de2a5 100644
--- a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MemoryTrimTest.java
+++ b/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MemoryTrimTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -34,6 +36,7 @@ public class MemoryTrimTest {
     @Test
     public void onLowMemoryEvent() {
         when(context.getApplicationContext()).thenReturn(context);
+        doNothing().when(context).registerComponentCallbacks(any());
         Client client = new Client(context, BugsnagTestUtils.generateConfiguration());
 
         // block until observer is registered