Update to latest Espresso version according to #430

-Update Espresso versions -Add to the sample app Multidex configuration since there was a Dex error after updating the Espresso versions
AdevintaSpain · Aug 9, 2021 · 58f1768 · 58f1768
1 parent 18e7974
commit 58f1768
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -24,10 +24,12 @@ android {
 }
 
 dependencies {
-  api("androidx.test.espresso:espresso-core:3.1.1")
-  api("androidx.test.espresso:espresso-contrib:3.1.1")
+  api("androidx.test.ext:junit:1.0.0")
+  api("androidx.test.espresso:espresso-core:3.4.0")
+  api("androidx.test.espresso:espresso-contrib:3.4.0")
   api("androidx.test.uiautomator:uiautomator:2.2.0")
-  api("androidx.test.espresso:espresso-intents:3.1.1")
+  api("androidx.test.espresso:espresso-intents:3.4.0")
+
 
   implementation("androidx.annotation:annotation:1.0.2")
   implementation("androidx.legacy:legacy-support-core-ui:1.0.0")

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -12,6 +12,7 @@ android {
   defaultConfig {
     minSdk = 19
     targetSdk = 30
+    multiDexEnabled = true
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     testInstrumentationRunnerArguments["clearPackageData"] = "true"
@@ -38,6 +39,7 @@ dependencies {
   implementation("com.github.bumptech.glide:glide:4.10.0")
   implementation("com.google.android.material:material:1.2.0")
   implementation("androidx.core:core-ktx:1.0.1")
+  implementation("androidx.multidex:multidex:2.0.1")
 
   androidTestUtil("androidx.test:orchestrator:1.3.0")
   androidTestImplementation(project(":library"))

diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/AssertAnyTest.kt b/sample/src/androidTest/java/com/adevinta/android/barista/sample/AssertAnyTest.kt
@@ -4,7 +4,7 @@ import android.widget.EditText
 import android.widget.ImageView
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.adevinta.android.barista.assertion.BaristaAssertions.assertAny
 import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo
 import com.adevinta.android.barista.internal.failurehandler.BaristaException

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
       android:label="@string/app_name"
       android:supportsRtl="true"
       android:theme="@style/AppTheme"
+      android:name="androidx.multidex.MultiDexApplication"
       >
     <activity android:name=".SomeViewsWithDifferentVisibilitiesActivity"/>
     <activity android:name=".FlowFirstScreen"/>