1 files changed, 19 insertions, 12 deletions
diff --git a/sample/build.gradle b/sample/build.gradle
index d7199a3..bb7cab0 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -4,11 +4,8 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.triplet.play'
 
 play {
-    jsonFile = file('../files/gplay-keys.json')
+    serviceAccountCredentials = file('../files/gplay-keys.json')
     track = 'beta'
-    errorOnSizeLimit = true
-    uploadImages = false
-    untrackOld = true
 }
 
 android {
@@ -27,7 +24,7 @@ android {
         versionName androidGitVersion.name()
         versionCode androidGitVersion.code()
         multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     def releaseSigning = file("../files/kau.properties")
@@ -101,6 +98,18 @@ android {
             }
         }
     }
+
+    // See https://github.com/facebook/flipper/issues/146
+    configurations.all {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            def requested = details.requested
+            if (requested.group == "com.android.support") {
+                if (!requested.name.startsWith("multidex")) {
+                    details.useVersion "26.+"
+                }
+            }
+        }
+    }
 }
 
 dependencies {
@@ -113,17 +122,15 @@ dependencies {
     implementation project(':searchview')
     implementation project(':mediapicker')
 
-//    androidTestImplementation("com.android.support.test.espresso:espresso-core:${kau.espresso}") {
-//        exclude group: 'com.android.support', module: 'support-annotations'
-//    }
-//    androidTestImplementation("com.android.support.test:runner:${kau.testRunner}") {
-//        exclude group: 'com.android.support', module: 'support-annotations'
-//    }
-//    androidTestImplementation kauDependency.kotlinTest
+    implementation "com.afollestad.material-dialogs:input:${kau.materialDialog}"
+
     testImplementation kauDependency.kotlinTest
     testImplementation kauDependency.junit
 
     androidTestImplementation kauDependency.kotlinTest
     androidTestImplementation kauDependency.espresso
+    androidTestImplementation "androidx.test.espresso:espresso-intents:${kau.espresso}"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:${kau.espresso}"
+    androidTestImplementation kauDependency.testRules
     androidTestImplementation kauDependency.testRunner
 }