Upgrade to Robolectric 4.14-beta-1 (#370)

Also updated our golden images, after the CMP and Robolectric upgrades. This fixes robolectric/robolectric#9691
chrisbanes · Oct 25, 2024 · 2dcdcc5 · 2dcdcc5
1 parent 9a36e0a
commit 2dcdcc5
Show file tree

Hide file tree

Showing 36 changed files with 19 additions and 5 deletions.
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ kotlin = "2.0.21"
 ktor = "3.0.0"
 jetpack-compose = "1.7.4"
 metalava = "0.3.5"
-robolectric = "4.13"
+robolectric = "4.14-beta-1"
 roborazzi = "1.29.0"
 spotless = "6.25.0"
 

diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard.png b/haze/screenshots/android/HazeScreenshotTest.creditCard.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_alpha.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_alpha.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_childTint_magenta.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_childTint_magenta.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_childTint_red.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_childTint_red.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_childTint_yellow.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_childTint_yellow.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_compositionLocalStyle.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_compositionLocalStyle.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_conditional_0_initial.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_conditional_0_initial.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_conditional_1_disabled.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_conditional_1_disabled.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_conditional_2_reenabled.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_conditional_2_reenabled.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_mask.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_mask.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_progressive_horiz.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_progressive_horiz.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_progressive_vertical.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_progressive_vertical.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_bottomEnd.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_bottomEnd.png
diff --git a/...screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_bottomStart.png b/...screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_bottomStart.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_topEnd.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_topEnd.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_topStart.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_roundedCorner_topStart.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_style.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_style.png
diff --git a/haze/screenshots/android/HazeScreenshotTest.creditCard_transparentTint.png b/haze/screenshots/android/HazeScreenshotTest.creditCard_transparentTint.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_childTint_magenta.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_childTint_magenta.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_childTint_red.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_childTint_red.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_childTint_yellow.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_childTint_yellow.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_conditional_0_initial.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_conditional_0_initial.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_conditional_2_reenabled.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_conditional_2_reenabled.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_mask.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_mask.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_progressive_horiz.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_progressive_horiz.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_progressive_vertical.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_progressive_vertical.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_bottomEnd.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_bottomEnd.png
diff --git a/...screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_bottomStart.png b/...screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_bottomStart.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_topEnd.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_topEnd.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_topStart.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_roundedCorner_topStart.png
diff --git a/haze/screenshots/desktop/HazeScreenshotTest.creditCard_transparentTint.png b/haze/screenshots/desktop/HazeScreenshotTest.creditCard_transparentTint.png
diff --git a/haze/src/screenshotTest/kotlin/dev/chrisbanes/haze/HazeScreenshotTest.kt b/haze/src/screenshotTest/kotlin/dev/chrisbanes/haze/HazeScreenshotTest.kt
@@ -14,7 +14,6 @@ import androidx.compose.ui.unit.dp
 import dev.chrisbanes.haze.test.ScreenshotTest
 import dev.chrisbanes.haze.test.ScreenshotTheme
 import dev.chrisbanes.haze.test.runScreenshotTest
-import kotlin.test.Ignore
 import kotlin.test.Test
 
 class HazeScreenshotTest : ScreenshotTest() {
@@ -88,7 +87,6 @@ class HazeScreenshotTest : ScreenshotTest() {
   }
 
   @Test
-  @Ignore // https://github.com/robolectric/robolectric/issues/9691
   fun creditCard_progressive_horiz() = runScreenshotTest {
     setContent {
       ScreenshotTheme {
@@ -102,7 +100,6 @@ class HazeScreenshotTest : ScreenshotTest() {
   }
 
   @Test
-  @Ignore // https://github.com/robolectric/robolectric/issues/9691
   fun creditCard_progressive_vertical() = runScreenshotTest {
     setContent {
       ScreenshotTheme {

diff --git a/internal/screenshot-test/src/androidMain/kotlin/dev/chrisbanes/haze/test/ScreenshotTest.kt b/internal/screenshot-test/src/androidMain/kotlin/dev/chrisbanes/haze/test/ScreenshotTest.kt
@@ -23,7 +23,7 @@ import org.robolectric.annotation.GraphicsMode
 
 @RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-@Config(sdk = [28, 32, 33], qualifiers = RobolectricDeviceQualifiers.Pixel5)
+@Config(sdk = [28, 32, 35], qualifiers = RobolectricDeviceQualifiers.Pixel5)
 actual abstract class ScreenshotTest {
   @get:Rule
   val composeTestRule = createAndroidComposeRule<ComponentActivity>()