diff options
| author | Michael Hoisie <hoisie@google.com> | 2024-03-29 14:08:12 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2024-03-29 14:08:49 -0700 |
| commit | 4421bed8e8e049eded8a0cdb99fb71888bde9d8e (patch) | |
| tree | 5a45940d9be4472aab7413e476b04dc79c51ad14 | |
| parent | cb37bf934a4b1c7b2279eba6606cf51cafef636d (diff) | |
| download | robolectric-4421bed8e8e049eded8a0cdb99fb71888bde9d8e.tar.gz | |
Bump the preinstrumented jar version to 6
This includes the fix for using Java serialization on Android objects. It is
also necessary to prepare for a new release.
For #8786
PiperOrigin-RevId: 620336299
| -rw-r--r-- | .github/workflows/copybara_build_and_test.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/tests.yml | 1 | ||||
| -rw-r--r-- | buildSrc/src/main/groovy/AndroidSdk.groovy | 2 | ||||
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/copybara_build_and_test.yml b/.github/workflows/copybara_build_and_test.yml index 55a995360..f780ecf94 100644 --- a/.github/workflows/copybara_build_and_test.yml +++ b/.github/workflows/copybara_build_and_test.yml @@ -40,6 +40,5 @@ jobs: -Drobolectric.alwaysIncludeVariantMarkersInTestName=true \ -Drobolectric.enabledSdks=34 \ -Dorg.gradle.workers.max=2 \ - -Drobolectric.usePreinstrumentedJars=false \ -x :integration_tests:nativegraphics:test \ ) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 66ca84bb9..00e9e46b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -68,7 +68,6 @@ jobs: --no-watch-fs \ -Drobolectric.enabledSdks=${{ matrix.api-versions }} \ -Drobolectric.alwaysIncludeVariantMarkersInTestName=true \ - -Drobolectric.usePreinstrumentedJars=false \ -Dorg.gradle.workers.max=2 \ -x :integration_tests:nativegraphics:test \ -x :integration_tests:roborazzi:test diff --git a/buildSrc/src/main/groovy/AndroidSdk.groovy b/buildSrc/src/main/groovy/AndroidSdk.groovy index 3b38b3cac..5a6ed794b 100644 --- a/buildSrc/src/main/groovy/AndroidSdk.groovy +++ b/buildSrc/src/main/groovy/AndroidSdk.groovy @@ -1,5 +1,5 @@ class AndroidSdk implements Comparable<AndroidSdk> { - static final PREINSTRUMENTED_VERSION = 5 + static final PREINSTRUMENTED_VERSION = 6 static final KITKAT = new AndroidSdk(19, "4.4_r1", "r2") static final LOLLIPOP = new AndroidSdk(21, "5.0.2_r3", "r0") diff --git a/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java b/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java index 3b6f76da9..0f9272c03 100644 --- a/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java +++ b/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java @@ -46,7 +46,7 @@ public class DefaultSdkProvider implements SdkProvider { private static final int RUNNING_JAVA_VERSION = Util.getJavaVersion(); - private static final int PREINSTRUMENTED_VERSION = 5; + private static final int PREINSTRUMENTED_VERSION = 6; private final DependencyResolver dependencyResolver; |