From 6e60b1763c18bd2e42b8080bad117196dd59d4d0 Mon Sep 17 00:00:00 2001
From: Don Yu <don@instagram.com>
Date: Thu, 11 Aug 2016 09:47:36 -0700
Subject: [PATCH] Strip out okhttp3 dependency from react/common module

Reviewed By: AaaChiuuu

Differential Revision: D3698882

fbshipit-source-id: 15a123b42382f11b6f88d7b0c1e12c463bb6a740
---
 .../src/main/java/com/facebook/react/common/BUCK |  7 +++++--
 .../java/com/facebook/react/common/network/BUCK  | 16 ++++++++++++++++
 .../main/java/com/facebook/react/devsupport/BUCK |  1 +
 .../java/com/facebook/react/modules/network/BUCK |  1 +
 .../test/java/com/facebook/react/modules/BUCK    |  1 +
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK

diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
index 289daab3d45..fef2490d0a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
@@ -1,13 +1,16 @@
 include_defs('//ReactAndroid/DEFS')
 
+SUB_PROJECTS = [
+  'network/**/*',
+]
+
 android_library(
   name = 'common',
-  srcs = glob(['**/*.java']),
+  srcs = glob(['**/*.java'], excludes=SUB_PROJECTS),
   deps = [
     ':build_config',
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
-    react_native_dep('third-party/java/okhttp:okhttp3'),
   ],
   exported_deps = [
     react_native_dep('java/com/facebook/proguard/annotations:annotations'),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
new file mode 100644
index 00000000000..c862f230a35
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
@@ -0,0 +1,16 @@
+include_defs('//ReactAndroid/DEFS')
+
+android_library(
+  name = 'network',
+  srcs = glob(['**/*.java']),
+  deps = [
+    react_native_dep('third-party/java/okhttp:okhttp3'),
+  ],
+  visibility = [
+    'PUBLIC',
+  ],
+)
+
+project_config(
+  src_target = ':network',
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
index 085e1762185..4c3da337e37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@@ -12,6 +12,7 @@ android_library(
     react_native_dep('third-party/java/okhttp:okhttp3-ws'),
     react_native_dep('third-party/java/okio:okio'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common/network:network'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/modules/debug:debug'),
     react_native_target('java/com/facebook/react/modules/systeminfo:systeminfo'),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
index aa6b475a035..494316468e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
@@ -12,6 +12,7 @@ android_library(
     react_native_dep('third-party/java/okhttp:okhttp3-urlconnection'),
     react_native_dep('third-party/java/okio:okio'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common/network:network'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/modules/core:core'),
   ],
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
index 33400cb7a8c..c6202db15cf 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
@@ -17,6 +17,7 @@ robolectric3_test(
     react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
     react_native_target('java/com/facebook/react/animation:animation'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common/network:network'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/devsupport:devsupport'),
     react_native_target('java/com/facebook/react/modules/clipboard:clipboard'),