diff --git a/gradle.properties b/gradle.properties index 3e9143bbded..6fc0835cd8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ errorproneVersion=2.9.0 errorproneJavacVersion=9+181-r4173-1 axtVersion=1.4.0 -espressoVersion=3.4.0 +espressoVersion=3.5.0-alpha03 axtJunitVersion=1.1.3 android.useAndroidX=true diff --git a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoTest.java b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoTest.java index 830b0f2c57e..fbccce751a3 100644 --- a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoTest.java +++ b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoTest.java @@ -27,11 +27,6 @@ /** Simple tests to verify espresso APIs can be used on both Robolectric and device. */ @RunWith(AndroidJUnit4.class) -@Config( - instrumentedPackages = { - // required to access final members on androidx.loader.content.ModernAsyncTask - "androidx.loader.content" - }) public final class EspressoTest { @Rule diff --git a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithMenuTest.java b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithMenuTest.java index 21c5b7934db..3a543bc6530 100644 --- a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithMenuTest.java +++ b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithMenuTest.java @@ -21,11 +21,6 @@ @RunWith(AndroidJUnit4.class) @TextLayoutMode(Mode.REALISTIC) @LooperMode(PAUSED) -@Config( - instrumentedPackages = { - // required to access final members on androidx.loader.content.ModernAsyncTask - "androidx.loader.content" - }) public class EspressoWithMenuTest { @Test diff --git a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithPausedLooperTest.java b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithPausedLooperTest.java index 2c6430e3e60..022595fb391 100644 --- a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithPausedLooperTest.java +++ b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithPausedLooperTest.java @@ -16,11 +16,6 @@ import org.robolectric.integration.axt.R; /** Verify Espresso usage with paused looper */ -@Config( - instrumentedPackages = { - // required to access final members on androidx.loader.content.ModernAsyncTask - "androidx.loader.content" - }) @RunWith(AndroidJUnit4.class) public final class EspressoWithPausedLooperTest { diff --git a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithSwitchCompatTest.java b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithSwitchCompatTest.java index 8f00e6a8cb2..53f094260c8 100644 --- a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithSwitchCompatTest.java +++ b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithSwitchCompatTest.java @@ -17,11 +17,6 @@ /** Tests Espresso on Activities with {@link androidx.appcompat.widget.SwitchCompat}. */ @RunWith(AndroidJUnit4.class) @TextLayoutMode(TextLayoutMode.Mode.REALISTIC) -@Config( - instrumentedPackages = { - // required to access final members on androidx.loader.content.ModernAsyncTask - "androidx.loader.content" - }) public class EspressoWithSwitchCompatTest { @Test public void switchCompatTest() { diff --git a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithToolbarMenuTest.java b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithToolbarMenuTest.java index 9cd23f6cbf4..44e4f0a3fa7 100644 --- a/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithToolbarMenuTest.java +++ b/integration_tests/androidx_test/src/test/java/org/robolectric/integrationtests/axt/EspressoWithToolbarMenuTest.java @@ -22,11 +22,6 @@ @RunWith(AndroidJUnit4.class) @TextLayoutMode(Mode.REALISTIC) @LooperMode(PAUSED) -@Config( - instrumentedPackages = { - // required to access final members on androidx.loader.content.ModernAsyncTask - "androidx.loader.content" - }) public class EspressoWithToolbarMenuTest { @Test public void appCompatToolbarMenuClick() {