Remove deprecated method

These methods were supposed to be removed in older versions of Robolectric
robolectric · Mar 14, 2024 · 71832ba · 71832ba
1 parent a13a8db
commit 71832ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 189 deletions.
diff --git a/robolectric/src/main/java/org/robolectric/ConfigMerger.java b/robolectric/src/main/java/org/robolectric/ConfigMerger.java
diff --git a/robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java b/robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java
@@ -62,7 +62,11 @@
 @SuppressWarnings("NewApi")
 public class RobolectricTestRunner extends SandboxTestRunner {
 
-  public static final String CONFIG_PROPERTIES = "robolectric.properties";
+  /**
+   * @deprecated No longer used. This constant will be removed in a future version of Robolectric.
+   */
+  @Deprecated public static final String CONFIG_PROPERTIES = "robolectric.properties";
+
   private static final Injector DEFAULT_INJECTOR = defaultInjector().build();
   private static final Map<ManifestIdentifier, AndroidManifest> appManifestsCache = new HashMap<>();
 
@@ -106,7 +110,7 @@ protected RobolectricTestRunner(final Class<?> testClass, Injector injector)
     super(testClass, injector);
 
     if (DeprecatedTestRunnerDefaultConfigProvider.globalConfig == null) {
-      DeprecatedTestRunnerDefaultConfigProvider.globalConfig = buildGlobalConfig();
+      DeprecatedTestRunnerDefaultConfigProvider.globalConfig = new Config.Builder().build();
     }
 
     this.sandboxManager = injector.getInstance(SandboxManager.class);
@@ -415,30 +419,6 @@ private Configuration getConfiguration(Method method) {
     return configurationStrategy.getConfig(getTestClass().getJavaClass(), method);
   }
 
-  /**
-   * Provides the base Robolectric configuration {@link Config} used for all tests.
-   *
-   * <p>Configuration provided for specific packages, test classes, and test method configurations
-   * will override values provided here.
-   *
-   * <p>Custom TestRunner subclasses may wish to override this method to provide alternate
-   * configuration. Consider using a {@link Config.Builder}.
-   *
-   * <p>The default implementation has appropriate values for most use cases.
-   *
-   * @return global {@link Config} object
-   * @deprecated Provide a service implementation of {@link GlobalConfigProvider} instead. This
-   *     method will be removed in Robolectric 4.3.
-   * @since 3.1.3
-   * @see <a href="http://robolectric.org/migrating/#migrating-to-40">Migration Notes</a> for more
-   *     details.
-   */
-  @Deprecated
-  @SuppressWarnings("InlineMeSuggester")
-  protected Config buildGlobalConfig() {
-    return new Config.Builder().build();
-  }
-
   @AutoService(GlobalConfigProvider.class)
   @Priority(Integer.MIN_VALUE)
   @Deprecated

diff --git a/shadows/framework/src/main/java/org/robolectric/android/controller/ServiceController.java b/shadows/framework/src/main/java/org/robolectric/android/controller/ServiceController.java
@@ -91,15 +91,4 @@ public ServiceController<T> unbind() {
     shadowMainLooper.idleIfPaused();
     return this;
   }
-
-  /**
-   * @deprecated Use the appropriate builder in {@link org.robolectric.Robolectric} instead.
-   *
-   * This method will be removed in Robolectric 3.6.
-   */
-  @Deprecated
-  public ServiceController<T> withIntent(Intent intent) {
-    this.intent = intent;
-    return this;
-  }
 }