diff --git a/integration_tests/sdkcompat/build.gradle b/integration_tests/sdkcompat/build.gradle index 9f5fff0a4ed..f0c9f7caeb4 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 cd8b3f105b3..760b4af4a9c 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"> + tools:targetApi="q" /> 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 f159686a49f..5721d17a410 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 @@ @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 c7be16a0bf4..1a775ed6a54 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 89a6c8b4c2e..3d78689f298 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