From 04f9beccfead07fa24abd9b5d17b2f582da8c514 Mon Sep 17 00:00:00 2001 From: "Ian G. Clifton" Date: Tue, 27 Dec 2022 14:22:51 -0800 Subject: [PATCH 1/2] [All] Updated Robolectric to 4.9.1 This fixes #1055. --- Crane/gradle/libs.versions.toml | 3 +-- JetLagged/gradle/libs.versions.toml | 3 +-- JetNews/gradle/libs.versions.toml | 3 +-- Jetcaster/gradle/libs.versions.toml | 3 +-- Jetchat/gradle/libs.versions.toml | 3 +-- Jetsnack/gradle/libs.versions.toml | 3 +-- Jetsurvey/gradle/libs.versions.toml | 3 +-- Owl/gradle/libs.versions.toml | 3 +-- Reply/gradle/libs.versions.toml | 3 +-- scripts/libs.versions.toml | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index cd648850a..b629bc47b 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -42,8 +42,7 @@ material = "1.8.0-beta01" # @keep minSdk = "21" okhttp = "4.10.0" -# @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -robolectric = "4.5.1" +robolectric = "4.9.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" From 1c25fd4a4820b3ec1c470e1e4cee78af0f2fb0fe Mon Sep 17 00:00:00 2001 From: "Ian G. Clifton" Date: Tue, 27 Dec 2022 15:28:38 -0800 Subject: [PATCH 2/2] Added workaround to robolectric.properties --- JetNews/app/src/test/resources/robolectric.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/JetNews/app/src/test/resources/robolectric.properties b/JetNews/app/src/test/resources/robolectric.properties index 3a224e624..54ee43225 100644 --- a/JetNews/app/src/test/resources/robolectric.properties +++ b/JetNews/app/src/test/resources/robolectric.properties @@ -3,3 +3,6 @@ sdk=30 # Similar to Galaxy Nexus device profile qualifiers=w360dp-h640dp-xhdpi + +# Workaround for https://github.com/robolectric/robolectric/issues/6593 +instrumentedPackages=androidx.loader.content