From c4a9b603e2d5bd28ef5ef92a3241aa9d1eb847dd Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 19 Sep 2019 02:58:43 -0700 Subject: [PATCH] Make network a separate plugin Summary: Per title. Reviewed By: jknoxville Differential Revision: D17419678 fbshipit-source-id: aee00f077b7ed955c60884853dc1128d27366ee8 --- android/build.gradle | 1 - android/plugins/network/build.gradle | 25 +++++++++++++++++++ .../network/src/main/AndroidManifest.xml | 11 ++++++++ .../network/FlipperOkhttpInterceptor.java | 0 .../plugins/network/NetworkFlipperPlugin.java | 0 .../plugins/network/NetworkReporter.java | 0 .../network/NetworkResponseFormatter.java | 0 android/sample/build.gradle | 1 + android/tutorial/build.gradle | 1 + settings.gradle | 3 +++ 10 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 android/plugins/network/build.gradle create mode 100644 android/plugins/network/src/main/AndroidManifest.xml rename android/{ => plugins/network}/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java (100%) rename android/{ => plugins/network}/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java (100%) rename android/{ => plugins/network}/src/main/java/com/facebook/flipper/plugins/network/NetworkReporter.java (100%) rename android/{ => plugins/network}/src/main/java/com/facebook/flipper/plugins/network/NetworkResponseFormatter.java (100%) diff --git a/android/build.gradle b/android/build.gradle index 5aa8668ab..f59f47785 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -65,7 +65,6 @@ android { implementation deps.jsr305 implementation deps.supportAppCompat implementation deps.stetho - implementation deps.okhttp3 implementation deps.lithoCore implementation deps.lithoSectionsDebug implementation deps.lithoSectionsCore diff --git a/android/plugins/network/build.gradle b/android/plugins/network/build.gradle new file mode 100644 index 000000000..4eac20f00 --- /dev/null +++ b/android/plugins/network/build.gradle @@ -0,0 +1,25 @@ +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the LICENSE + * file in the root directory of this source tree. + */ + +apply plugin: 'com.android.library' +apply plugin: 'maven' + +android { + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion + + defaultConfig { + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion + } + + dependencies { + implementation project(':android') + implementation deps.okhttp3 + compileOnly deps.jsr305 + } +} diff --git a/android/plugins/network/src/main/AndroidManifest.xml b/android/plugins/network/src/main/AndroidManifest.xml new file mode 100644 index 000000000..bcd3dc7de --- /dev/null +++ b/android/plugins/network/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java b/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java rename to android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java b/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java rename to android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkReporter.java b/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/NetworkReporter.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/network/NetworkReporter.java rename to android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/NetworkReporter.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkResponseFormatter.java b/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/NetworkResponseFormatter.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/network/NetworkResponseFormatter.java rename to android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/NetworkResponseFormatter.java diff --git a/android/sample/build.gradle b/android/sample/build.gradle index d631abb90..f54ec2409 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -68,5 +68,6 @@ dependencies { debugImplementation project(':android') debugImplementation project(':fresco-plugin') + debugImplementation project(':network-plugin') releaseImplementation project(':noop') } diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle index d0171417c..be773e5fb 100644 --- a/android/tutorial/build.gradle +++ b/android/tutorial/build.gradle @@ -46,6 +46,7 @@ dependencies { // Check out the "sample" app to see how to separate your build flavors. implementation project(':android') implementation project(':fresco-plugin') + implementation project(':network-plugin') implementation deps.soloader // Litho diff --git a/settings.gradle b/settings.gradle index e818f6b6e..904011465 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,3 +33,6 @@ project(':noop').projectDir = file('android/no-op/') // Plugins include ':fresco-plugin' project(':fresco-plugin').projectDir = file('android/plugins/fresco') + +include ':network-plugin' +project(':network-plugin').projectDir = file('android/plugins/network')