From 7fa2f6785c198d41a02e0348b9ef7cbafee74c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CJKAST=E2=80=9D?= Date: Thu, 8 Feb 2024 20:12:15 -0500 Subject: [PATCH] Add target google api, remove logs, update unit test imports --- .github/workflows/android.yml | 1 + android/sdl_android/build.gradle | 4 ++-- .../java/com/smartdevicelink/test/util/DeviceUtil.java | 9 --------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f9ca9c2861..ff00ebe719 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -22,6 +22,7 @@ jobs: uses: ReactiveCircus/android-emulator-runner@v2.30.1 with: api-level: 34 + target: google_apis arch: x86_64 script: ./android/gradlew -p ./android :sdl_android:connectedCheck diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle index d2f7b311af..82b6111997 100644 --- a/android/sdl_android/build.gradle +++ b/android/sdl_android/build.gradle @@ -57,11 +57,11 @@ dependencies { api 'androidx.annotation:annotation:1.1.0' annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-core:5.7.0' androidTestImplementation 'org.mockito:mockito-core:5.7.0' androidTestImplementation 'org.mockito:mockito-android:5.7.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1' } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java index 5644f95358..d4c0484d99 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java @@ -5,15 +5,6 @@ public class DeviceUtil { public static boolean isEmulator() { - Log.i("Julian", "isEmulator: " + Build.FINGERPRINT); - Log.i("Julian", "isEmulator: " + Build.MODEL); - Log.i("Julian", "isEmulator: " + Build.MANUFACTURER); - Log.i("Julian", "isEmulator: " + Build.BRAND); - Log.i("Julian", "isEmulator: " + Build.PRODUCT); - - - - return Build.FINGERPRINT.startsWith("generic") || Build.FINGERPRINT.startsWith("unknown") || Build.MODEL.contains("google_sdk")