diff --git a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewTest.kt b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewTest.kt index f4c283653..2e2a6999d 100644 --- a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewTest.kt +++ b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewTest.kt @@ -21,7 +21,6 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.shadows.ShadowDialog -import org.robolectric.annotation.Config import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -31,7 +30,6 @@ import org.wordpress.gutenberg.model.EditorConfiguration import org.wordpress.gutenberg.model.EditorDependencies @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28]) class GutenbergViewTest { @Mock private lateinit var mockWebView: WebView diff --git a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewUploadServerTest.kt b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewUploadServerTest.kt index a83cfe5f5..293c08778 100644 --- a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewUploadServerTest.kt +++ b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewUploadServerTest.kt @@ -17,7 +17,7 @@ import org.wordpress.gutenberg.model.EditorConfiguration import org.wordpress.gutenberg.model.EditorDependencies @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28], manifest = Config.NONE) +@Config(manifest = Config.NONE) class GutenbergViewUploadServerTest { private val testScope = TestScope() diff --git a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/inserter/SvgIconCacheTest.kt b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/inserter/SvgIconCacheTest.kt index 9f0b56dcc..dc09102cd 100644 --- a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/inserter/SvgIconCacheTest.kt +++ b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/inserter/SvgIconCacheTest.kt @@ -8,14 +8,12 @@ import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config /** * Robolectric is required because [parseSvgColor] delegates to [Color.parseColor] * for named colours and the resulting ARGB ints are produced via [Color.argb]. */ @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28]) class SvgIconCacheTest { // -- parseSvgColor ---------------------------------------------------- diff --git a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/views/EditorErrorViewTest.kt b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/views/EditorErrorViewTest.kt index 14c9394c9..373636883 100644 --- a/android/Gutenberg/src/test/java/org/wordpress/gutenberg/views/EditorErrorViewTest.kt +++ b/android/Gutenberg/src/test/java/org/wordpress/gutenberg/views/EditorErrorViewTest.kt @@ -14,11 +14,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config import org.wordpress.gutenberg.R @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28]) class EditorErrorViewTest { @Test diff --git a/android/Gutenberg/src/test/resources/robolectric.properties b/android/Gutenberg/src/test/resources/robolectric.properties new file mode 100644 index 000000000..2855c2546 --- /dev/null +++ b/android/Gutenberg/src/test/resources/robolectric.properties @@ -0,0 +1,2 @@ +# Robolectric otherwise defaults to the manifest's targetSdk, which requires a newer JVM than CI runs. +sdk=35