Rollforward after gms fixes

PiperOrigin-RevId: 493658588
bumptech · Dec 7, 2022 · e6f5eec · e6f5eec
1 parent b32fc26
commit e6f5eec
Show file tree

Hide file tree

Showing 12 changed files with 489 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -64,6 +64,7 @@ ANDROID_X_FRAGMENT_VERSION=1.3.6
 ANDROID_X_RECYCLERVIEW_VERSION=1.2.1
 ANDROID_X_TEST_CORE_VERSION=1.4.0
 ANDROID_X_TEST_ESPRESSO_VERSION=3.4.0
+ANDROID_X_FRAGMENT_TESTING_VERSION=1.5.0
 ANDROID_X_TEST_JUNIT_VERSION=1.1.3
 ANDROID_X_TEST_RULES_VERSION=1.4.0
 ANDROID_X_TEST_RUNNER_VERSION=1.4.0
@@ -74,6 +75,8 @@ ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.1.0
 ANDROID_X_CORE_KTX_VERSION=1.8.0
 ANDROID_X_LIFECYCLE_KTX_VERSION=2.4.1
 
+ANDROID_SUPPORT_MULTIDEX_VERSION=1.0.3
+
 # org.jetbrains versions
 JETBRAINS_KOTLINX_COROUTINES_VERSION=1.6.4
 JETBRAINS_KOTLINX_COROUTINES_TEST_VERSION=1.6.4

diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
@@ -6,24 +6,28 @@ tasks.whenTaskAdded { task ->
 apply plugin: 'com.android.application'
 
 dependencies {
-    debugImplementation 'androidx.fragment:fragment-testing:1.5.0'
     annotationProcessor project(":annotation:compiler")
     implementation project(":library")
+    implementation "com.android.support:multidex:$ANDROID_SUPPORT_MULTIDEX_VERSION"
+    implementation "androidx.appcompat:appcompat:$ANDROID_X_APPCOMPAT_VERSION"
 
     androidTestImplementation project(':library')
     androidTestImplementation project(':mocks')
     androidTestImplementation project(':testutil')
-    androidTestImplementation "org.mockito:mockito-android:${MOCKITO_ANDROID_VERSION}"
-    androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
-    androidTestImplementation "androidx.test:rules:${ANDROID_X_TEST_RULES_VERSION}"
-    androidTestImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
-    androidTestImplementation "com.google.truth:truth:${TRUTH_VERSION}"
-    androidTestImplementation "junit:junit:${JUNIT_VERSION}"
-    androidTestImplementation "androidx.exifinterface:exifinterface:${ANDROID_X_EXIF_INTERFACE_VERSION}"
+    androidTestImplementation "org.mockito:mockito-android:$MOCKITO_ANDROID_VERSION"
+    androidTestImplementation "androidx.test.ext:junit:$ANDROID_X_TEST_JUNIT_VERSION"
+    androidTestImplementation "androidx.test:rules:$ANDROID_X_TEST_RULES_VERSION"
+    androidTestImplementation "androidx.test:core:$ANDROID_X_TEST_CORE_VERSION"
+    androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$ANDROID_X_TEST_ESPRESSO_VERSION"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$ANDROID_X_TEST_ESPRESSO_VERSION"
+    androidTestImplementation "androidx.fragment:fragment-testing:$ANDROID_X_FRAGMENT_TESTING_VERSION"
+    androidTestImplementation "com.google.truth:truth:$TRUTH_VERSION"
+    androidTestImplementation "junit:junit:$JUNIT_VERSION"
+    androidTestImplementation "androidx.exifinterface:exifinterface:$ANDROID_X_EXIF_INTERFACE_VERSION"
 
     // Not totally clear why this is required, but it seems to be missing when tests are run on
     // 4.1.2 and 4.2.0 emulators.
-    androidTestImplementation "com.google.code.findbugs:jsr305:${JSR_305_VERSION}"
+    androidTestImplementation "com.google.code.findbugs:jsr305:$JSR_305_VERSION"
 }
 
 android {
@@ -36,11 +40,18 @@ android {
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    buildTypes {
+        debug {
+            isDefault = true
+        }
+    }
 }