Merge pull request #2967 from square/jakew/robo/2018-11-18

Update Robolectric
square · Nov 18, 2018 · 5d6650a · 5d6650a
2 parents 23592bc + 7d8dd16
commit 5d6650a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
     <junit.version>4.12</junit.version>
     <assertj.version>1.7.0</assertj.version>
     <mockito.version>1.9.5</mockito.version>
-    <robolectric.version>3.2</robolectric.version>
+    <robolectric.version>3.8</robolectric.version>
   </properties>
 
   <scm>

diff --git a/retrofit/src/test/java/retrofit2/CompletableFutureAndroidTest.java b/retrofit/src/test/java/retrofit2/CompletableFutureAndroidTest.java
@@ -30,9 +30,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.robolectric.annotation.Config.NEWEST_SDK;
+import static org.robolectric.annotation.Config.NONE;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = NEWEST_SDK)
+@Config(sdk = NEWEST_SDK, manifest = NONE)
 public final class CompletableFutureAndroidTest {
   @Rule public final MockWebServer server = new MockWebServer();
 

diff --git a/retrofit/src/test/java/retrofit2/OptionalConverterFactoryAndroidTest.java b/retrofit/src/test/java/retrofit2/OptionalConverterFactoryAndroidTest.java
@@ -31,9 +31,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.robolectric.annotation.Config.NEWEST_SDK;
+import static org.robolectric.annotation.Config.NONE;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = NEWEST_SDK)
+@Config(sdk = NEWEST_SDK, manifest = NONE)
 public final class OptionalConverterFactoryAndroidTest {
   interface Service {
     @GET("/") Call<Optional<Object>> optional();

diff --git a/retrofit/src/test/java/retrofit2/RequestFactoryAndroidTest.java b/retrofit/src/test/java/retrofit2/RequestFactoryAndroidTest.java
@@ -27,10 +27,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.robolectric.annotation.Config.NEWEST_SDK;
+import static org.robolectric.annotation.Config.NONE;
 import static retrofit2.RequestFactoryTest.buildRequest;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = NEWEST_SDK)
+@Config(sdk = NEWEST_SDK, manifest = NONE)
 @SuppressWarnings({"UnusedParameters", "unused"}) // Parameters inspected reflectively.
 public final class RequestFactoryAndroidTest {
   @Test public void getWithAndroidUriUrl() {