From 031fe4d7975e05e2cc4c750ce415f5f453f63467 Mon Sep 17 00:00:00 2001 From: Don Yu Date: Thu, 11 Aug 2016 09:47:37 -0700 Subject: [PATCH] Move JSPackagerWebSocketClient and JSDebuggerWebSocketClient to react/devsupport module Summary: This move lets us remove the dependency on okhttp3 from react/bridge. The classes I moved are all strictly related to dev support features and don't need to go into the core bridge module that gets shipped to production. Reviewed By: AaaChiuuu Differential Revision: D3698977 fbshipit-source-id: 6ba1517377061690cef289a544ec1622122cef85 --- ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK | 4 ---- .../src/main/java/com/facebook/react/devsupport/BUCK | 1 + .../java/com/facebook/react/devsupport/DevServerHelper.java | 1 - .../com/facebook/react/devsupport/DevSupportManagerImpl.java | 1 - .../{bridge => devsupport}/JSDebuggerWebSocketClient.java | 2 +- .../{bridge => devsupport}/JSPackagerWebSocketClient.java | 2 +- .../{bridge => devsupport}/WebsocketJavaScriptExecutor.java | 5 +++-- 7 files changed, 6 insertions(+), 10 deletions(-) rename ReactAndroid/src/main/java/com/facebook/react/{bridge => devsupport}/JSDebuggerWebSocketClient.java (99%) rename ReactAndroid/src/main/java/com/facebook/react/{bridge => devsupport}/JSPackagerWebSocketClient.java (99%) rename ReactAndroid/src/main/java/com/facebook/react/{bridge => devsupport}/WebsocketJavaScriptExecutor.java (97%) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index 94c83ed21..9a0645cbf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -26,11 +26,7 @@ android_library( react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'), react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'), react_native_dep('third-party/java/infer-annotations:infer-annotations'), - react_native_dep('third-party/java/jackson:core'), react_native_dep('third-party/java/jsr-305:jsr-305'), - react_native_dep('third-party/java/okhttp:okhttp3'), - react_native_dep('third-party/java/okhttp:okhttp3-ws'), - react_native_dep('third-party/java/okio:okio'), react_native_target('java/com/facebook/react/common:common'), ], visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK index 4c3da337e..a619b5090 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK @@ -7,6 +7,7 @@ android_library( deps = [ react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'), react_native_dep('third-party/java/infer-annotations:infer-annotations'), + react_native_dep('third-party/java/jackson:core'), react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_dep('third-party/java/okhttp:okhttp3'), react_native_dep('third-party/java/okhttp:okhttp3-ws'), diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java index 8c684e308..707b93303 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java @@ -15,7 +15,6 @@ import android.text.TextUtils; import com.facebook.common.logging.FLog; import com.facebook.infer.annotation.Assertions; -import com.facebook.react.bridge.JSPackagerWebSocketClient; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.network.OkHttpCallUtil; 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 912bb70f2..7f6f3f7df 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -45,7 +45,6 @@ import com.facebook.react.bridge.JavaJSExecutor; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.UiThreadUtil; -import com.facebook.react.bridge.WebsocketJavaScriptExecutor; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.ShakeDetector; import com.facebook.react.common.futures.SimpleSettableFuture; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java similarity index 99% rename from ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java rename to ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java index 9370f46b4..e3440d18a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.react.bridge; +package com.facebook.react.devsupport; import javax.annotation.Nullable; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSPackagerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSPackagerWebSocketClient.java similarity index 99% rename from ReactAndroid/src/main/java/com/facebook/react/bridge/JSPackagerWebSocketClient.java rename to ReactAndroid/src/main/java/com/facebook/react/devsupport/JSPackagerWebSocketClient.java index 04759d155..fd5f93bc0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSPackagerWebSocketClient.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSPackagerWebSocketClient.java @@ -6,7 +6,7 @@ * file in the same directory. */ -package com.facebook.react.bridge; +package com.facebook.react.devsupport; import javax.annotation.Nullable; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java similarity index 97% rename from ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java rename to ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java index 6198e5656..49d8bc08b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.react.bridge; +package com.facebook.react.devsupport; import javax.annotation.Nullable; @@ -19,6 +19,7 @@ import android.os.Handler; import android.os.Looper; import com.facebook.infer.annotation.Assertions; +import com.facebook.react.bridge.JavaJSExecutor; /** * Executes JS remotely via the react nodejs server as a proxy to a browser on the host machine. @@ -40,7 +41,7 @@ public class WebsocketJavaScriptExecutor implements JavaJSExecutor { } private static class JSExecutorCallbackFuture implements - JSDebuggerWebSocketClient.JSDebuggerCallback { + JSDebuggerWebSocketClient.JSDebuggerCallback { private final Semaphore mSemaphore = new Semaphore(0); private @Nullable Throwable mCause;