Add target google api, remove logs, update unit test imports

smartdevicelink · Feb 9, 2024 · 7fa2f67 · 7fa2f67
1 parent 84fe609
commit 7fa2f67
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -22,6 +22,7 @@ jobs:
       uses: ReactiveCircus/[email protected]
       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
@@ -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
@@ -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")