Upgrade Roboletric

kelvinmakau444 · Jan 10, 2022 · 9cd34b2 · 9cd34b2
1 parent 7c73f6e
commit 9cd34b2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/androidshared/src/test/resources/robolectric.properties b/androidshared/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+instrumentedPackages=androidx.loader.content
diff --git a/buildSrc/src/main/java/dependencies/Dependencies.kt b/buildSrc/src/main/java/dependencies/Dependencies.kt
@@ -91,7 +91,7 @@ object Dependencies {
     const val okhttp3_mockwebserver = "com.squareup.okhttp3:mockwebserver:${Versions.okhttp3}"
     const val kotlinx_coroutines_test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2"
     const val hamcrest = "org.hamcrest:hamcrest:2.2"
-    const val robolectric = "org.robolectric:robolectric:4.5.1"
-    const val robolectric_shadows_multidex = "org.robolectric:shadows-multidex:4.5.1"
+    const val robolectric = "org.robolectric:robolectric:4.7.3"
+    const val robolectric_shadows_multidex = "org.robolectric:shadows-multidex:4.7.3"
     const val uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
 }
diff --git a/collect_app/src/test/resources/robolectric.properties b/collect_app/src/test/resources/robolectric.properties
@@ -1 +1,3 @@
 application=org.odk.collect.android.application.RobolectricApplication
+instrumentedPackages=androidx.loader.content
+
diff --git a/download-robolectric-deps.sh b/download-robolectric-deps.sh
@@ -1,12 +1,14 @@
 set -e
 
-wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/6.0.1_r3-robolectric-r1/android-all-6.0.1_r3-robolectric-r1.jar -P robolectric-deps
-wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/7.0.0_r1-robolectric-r1/android-all-7.0.0_r1-robolectric-r1.jar -P robolectric-deps
-wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/11-robolectric-6757853/android-all-11-robolectric-6757853.jar -P robolectric-deps
+wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/6.0.1_r3-robolectric-r1-i3/android-all-instrumented-6.0.1_r3-robolectric-r1-i3.jar -P robolectric-deps
+wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/7.0.0_r1-robolectric-r1-i3/android-all-instrumented-7.0.0_r1-robolectric-r1-i3.jar -P robolectric-deps
+wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/11-robolectric-6757853-i3/android-all-instrumented-11-robolectric-6757853-i3.jar -P robolectric-deps
+wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/12-robolectric-7732740-i3/android-all-instrumented-12-robolectric-7732740-i3.jar -P robolectric-deps
 
 mkdir -p collect_app/src/test/resources && cp robolectric-deps.properties "$_"
 mkdir -p audiorecorder/src/test/resources && cp robolectric-deps.properties "$_"
 mkdir -p projects/src/test/resources && cp robolectric-deps.properties "$_"
 mkdir -p location/src/test/resources && cp robolectric-deps.properties "$_"
 mkdir -p androidshared/src/test/resources && cp robolectric-deps.properties "$_"
 mkdir -p geo/src/test/resources && cp robolectric-deps.properties "$_"
+mkdir -p permissions/src/test/resources && cp robolectric-deps.properties "$_"
diff --git a/permissions/src/test/resources/robolectric.properties b/permissions/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+instrumentedPackages=androidx.loader.content
diff --git a/robolectric-deps.properties b/robolectric-deps.properties
@@ -1,5 +1,4 @@
-org.robolectric\:android-all\:6.0.1_r3-robolectric-r1=../../../../../../robolectric-deps/android-all-6.0.1_r3-robolectric-r1.jar
-org.robolectric\:android-all\:7.0.0_r1-robolectric-r1=../../../../../../robolectric-deps/android-all-7.0.0_r1-robolectric-r1.jar
-org.robolectric\:android-all\:9-robolectric-4913185-2=../../../../../../robolectric-deps/android-all-9-robolectric-4913185-2.jar
-org.robolectric\:android-all\:10-robolectric-5803371=../../../../../../robolectric-deps/android-all-10-robolectric-5803371.jar
-org.robolectric\:android-all\:11-robolectric-6757853=../../../../../../robolectric-deps/android-all-11-robolectric-6757853.jar
+org.robolectric\:android-all-instrumented\:6.0.1_r3-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-6.0.1_r3-robolectric-r1-i3.jar
+org.robolectric\:android-all-instrumented\:7.0.0_r1-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-7.0.0_r1-robolectric-r1-i3.jar
+org.robolectric\:android-all-instrumented\:11-robolectric-6757853-i3=../../../../../../robolectric-deps/android-all-instrumented-11-robolectric-6757853-i3.jar
+org.robolectric\:android-all-instrumented\:12-robolectric-7732740-i3=../../../../../../robolectric-deps/android-all-instrumented-12-robolectric-7732740-i3.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		application=org.odk.collect.android.application.RobolectricApplication
		instrumentedPackages=androidx.loader.content