diff options
author | Michael Hoisie <hoisie@google.com> | 2024-04-26 19:10:12 +0000 |
---|---|---|
committer | Michael Hoisie <hoisie@gmail.com> | 2024-04-26 13:40:35 -0700 |
commit | e2a8e26117ad34548f2a3772cc0f2cd48c936f2f (patch) | |
tree | e1fa20f679b5a43a261428a42a56292c40727bb5 | |
parent | d440248316a4fbd1eb97b2b7f7c45ae79e6cd14c (diff) | |
download | robolectric-e2a8e26117ad34548f2a3772cc0f2cd48c936f2f.tar.gz |
Bump sdkcompat integration test to target SDK 29 (Q)
Previously it targeted SDK 28 (P), but at this point it is okay to
expect that the min supported compile SDK is Q.
5 files changed, 9 insertions, 9 deletions
diff --git a/integration_tests/sdkcompat/build.gradle b/integration_tests/sdkcompat/build.gradle index 9f5fff0a4..f0c9f7cae 100644 --- a/integration_tests/sdkcompat/build.gradle +++ b/integration_tests/sdkcompat/build.gradle @@ -14,13 +14,13 @@ spotless { } android { - compileSdk 28 + compileSdk 29 namespace 'org.robolectric.integrationtests.sdkcompat' defaultConfig { minSdk 19 - // We must keep targetSdk to 28 for compatibility testing purpose - targetSdk 28 + // We must keep targetSdk to 29 for compatibility testing purpose + targetSdk 29 } compileOptions { diff --git a/integration_tests/sdkcompat/src/main/AndroidManifest.xml b/integration_tests/sdkcompat/src/main/AndroidManifest.xml index cd8b3f105..760b4af4a 100644 --- a/integration_tests/sdkcompat/src/main/AndroidManifest.xml +++ b/integration_tests/sdkcompat/src/main/AndroidManifest.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android"> <application android:appComponentFactory="org.robolectric.integrationtests.sdkcompat.TestAppComponentFactory" - tools:targetApi="p" /> + tools:targetApi="q" /> </manifest> diff --git a/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java index f159686a4..5721d17a4 100644 --- a/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java +++ b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java @@ -14,8 +14,8 @@ import org.robolectric.RobolectricTestRunner; @RunWith(RobolectricTestRunner.class) public class JavaClassResolveCompatibilityTest { @Test - public void sdkIs28() { - assertThat(Build.VERSION.SDK_INT).isEqualTo(Build.VERSION_CODES.P); + public void sdkIs29() { + assertThat(Build.VERSION.SDK_INT).isEqualTo(Build.VERSION_CODES.Q); } @Test diff --git a/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt index c7be16a0b..1a775ed6a 100644 --- a/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt +++ b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt @@ -27,8 +27,8 @@ class NormalCompatibilityTest { private val application = RuntimeEnvironment.getApplication() @Test - fun `Environment SDK is 28`() { - assertThat(Build.VERSION.SDK_INT).isEqualTo(Build.VERSION_CODES.P) + fun `Environment SDK is 29`() { + assertThat(Build.VERSION.SDK_INT).isEqualTo(Build.VERSION_CODES.Q) } @Test diff --git a/integration_tests/sdkcompat/src/test/resources/robolectric.properties b/integration_tests/sdkcompat/src/test/resources/robolectric.properties index 89a6c8b4c..3d78689f2 100644 --- a/integration_tests/sdkcompat/src/test/resources/robolectric.properties +++ b/integration_tests/sdkcompat/src/test/resources/robolectric.properties @@ -1 +1 @@ -sdk=28
\ No newline at end of file +sdk=29 |