diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java index e30f0288d..262dab252 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java @@ -18,12 +18,6 @@ import javax.annotation.Nullable; import android.os.Bundle; -import com.facebook.react.bridge.ReadableMap; -import com.facebook.react.bridge.ReadableMapKeySetIterator; -import com.facebook.react.bridge.ReadableType; -import com.facebook.react.bridge.WritableNativeArray; -import com.facebook.react.bridge.WritableNativeMap; - public class Arguments { private static Object makeNativeObject(Object object) { if (object == null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 42ffc8c19..1ed7aaaef 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -23,14 +23,6 @@ import com.facebook.common.logging.FLog; import com.facebook.infer.annotation.Assertions; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.CatalystInstance; -import com.facebook.react.bridge.JavaScriptModule; -import com.facebook.react.bridge.JavaScriptModuleRegistry; -import com.facebook.react.bridge.MemoryPressure; -import com.facebook.react.bridge.NativeArray; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.NativeModuleCallExceptionHandler; -import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener; import com.facebook.react.bridge.queue.MessageQueueThread; import com.facebook.react.bridge.queue.QueueThreadExceptionHandler; import com.facebook.react.bridge.queue.ReactQueueConfiguration; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java index e6cb4e61c..0198029d5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java @@ -4,7 +4,6 @@ package com.facebook.react.bridge; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.NativeModule; import com.facebook.soloader.SoLoader; /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java index b00a7851b..965d65bec 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java @@ -11,7 +11,7 @@ package com.facebook.react.bridge; import android.content.Context; -import com.facebook.react.devsupport.DebugServerException; +import com.facebook.react.common.DebugServerException; /** * A class that stores JS bundle information and allows {@link CatalystInstance} to load a correct diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java index 1d65e9b1d..a0515dbed 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java @@ -11,9 +11,6 @@ package com.facebook.react.bridge; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.ReadableNativeArray; -import com.facebook.react.bridge.WritableNativeArray; -import com.facebook.react.bridge.WritableNativeMap; import com.facebook.soloader.SoLoader; @DoNotStrip diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java index c78be62ca..8b41f61a3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java @@ -15,21 +15,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import com.facebook.infer.annotation.Assertions; -import com.facebook.react.bridge.BaseJavaModule; -import com.facebook.react.bridge.Callback; -import com.facebook.react.bridge.Dynamic; -import com.facebook.react.bridge.DynamicFromArray; -import com.facebook.react.bridge.JSInstance; -import com.facebook.react.bridge.NativeArgumentsParseException; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.Promise; -import com.facebook.react.bridge.PromiseImpl; -import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.bridge.ReadableMap; -import com.facebook.react.bridge.ReadableNativeArray; -import com.facebook.react.bridge.UnexpectedNativeTypeException; -import com.facebook.react.bridge.WritableArray; -import com.facebook.react.bridge.WritableMap; import com.facebook.systrace.SystraceMessage; import static com.facebook.infer.annotation.Assertions.assertNotNull; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java index 7c243711f..746a3347f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java @@ -19,15 +19,6 @@ import java.util.Map; import java.util.Set; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.BaseJavaModule; -import com.facebook.react.bridge.JSInstance; -import com.facebook.react.bridge.NativeArray; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.ReactMarker; -import com.facebook.react.bridge.ReactMethod; -import com.facebook.react.bridge.ReadableNativeArray; -import com.facebook.react.bridge.WritableNativeArray; -import com.facebook.react.bridge.WritableNativeMap; import com.facebook.systrace.Systrace; import com.facebook.systrace.SystraceMessage; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java index 9bde9cc9e..3cab0efc6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java @@ -8,9 +8,6 @@ import javax.inject.Provider; import java.util.concurrent.atomic.AtomicInteger; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.ReactMarker; -import com.facebook.react.bridge.ReactMarkerConstants; import com.facebook.react.module.model.ReactModuleInfo; import com.facebook.systrace.Systrace; import com.facebook.systrace.SystraceMessage; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java index e9c2080b0..2e2672766 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java @@ -15,12 +15,6 @@ import java.util.List; import java.util.Map; import com.facebook.infer.annotation.Assertions; -import com.facebook.react.bridge.JSInstance; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.OnBatchCompleteListener; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactMarker; -import com.facebook.react.bridge.ReactMarkerConstants; import com.facebook.systrace.Systrace; /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java index 57d965062..e5d3307e4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java @@ -14,7 +14,6 @@ import javax.annotation.Nullable; import com.facebook.jni.HybridData; import com.facebook.soloader.SoLoader; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.JavaJSExecutor; /** * JavaScript executor that delegates JS calls processed by native code back to a java version diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java index bf6de9c5d..7f83367bd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java +++ b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.react.devsupport; +package com.facebook.react.common; import javax.annotation.Nullable; @@ -16,7 +16,6 @@ import java.io.IOException; import android.text.TextUtils; import com.facebook.common.logging.FLog; -import com.facebook.react.common.ReactConstants; import org.json.JSONException; import org.json.JSONObject; diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java index 85dc5c236..a06ac5c9e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; import com.facebook.common.logging.FLog; import com.facebook.infer.annotation.Assertions; import com.facebook.react.common.ReactConstants; +import com.facebook.react.common.DebugServerException; import org.json.JSONException; import org.json.JSONObject; diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java index b9a70a79d..3b39ea13a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java @@ -13,6 +13,7 @@ import android.os.Bundle; import android.preference.PreferenceActivity; import com.facebook.react.R; +import com.facebook.react.common.DebugServerException; /** * Activity that display developers settings. Should be added to the debug manifest of the app. Can diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index f5a28a66d..a9e4d9c21 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -35,6 +35,7 @@ import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.ReactConstants; +import com.facebook.react.common.DebugServerException; import com.facebook.react.common.ShakeDetector; import com.facebook.react.common.futures.SimpleSettableFuture; import com.facebook.react.devsupport.DevServerHelper.PackagerCommandListener;