From 755ad3b33a40bfb901d8b943c46c429433945713 Mon Sep 17 00:00:00 2001 From: Ram N Date: Tue, 3 Sep 2019 16:19:30 -0700 Subject: [PATCH] Move ReactNativeFlipper class to template Reviewed By: mdvacca Differential Revision: D6101369 fbshipit-source-id: e1ae8f57136dd568b7c14fa873a50bb490d73808 --- ReactAndroid/build.gradle | 6 ------ ReactAndroid/gradle.properties | 1 - template/android/app/build.gradle | 6 ++++++ .../src/debug/java/com/helloworld}/ReactNativeFlipper.java | 7 ++----- .../app/src/main/java/com/helloworld/MainApplication.java | 2 +- template/android/gradle.properties | 3 +++ 6 files changed, 12 insertions(+), 13 deletions(-) rename {ReactAndroid/src/debug/java/com/facebook/flipper => template/android/app/src/debug/java/com/helloworld}/ReactNativeFlipper.java (89%) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 47f6c74a07..67948d706c 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -380,12 +380,6 @@ dependencies { androidTestImplementation("androidx.test:runner:1.1.0") androidTestImplementation("androidx.test:rules:1.1.0") androidTestImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}") - - debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.yoga' - exclude group:'com.facebook.flipper', module: 'fbjni' - exclude group:'com.facebook.litho', module: 'litho-annotations' - } } apply(from: "release.gradle") diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index f9578765c0..400c171c68 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -20,7 +20,6 @@ BOOST_VERSION=1_63_0 DOUBLE_CONVERSION_VERSION=1.1.6 FOLLY_VERSION=2018.10.22.00 GLOG_VERSION=0.3.5 -FLIPPER_VERSION=0.23.4 android.useAndroidX=true android.enableJetifier=true diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index 21080c6b38..b19ddc598c 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -191,6 +191,12 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "com.facebook.react:react-native:+" // From node_modules + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { + exclude group:'com.facebook.yoga' + exclude group:'com.facebook.flipper', module: 'fbjni' + exclude group:'com.facebook.litho', module: 'litho-annotations' + } + if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; debugImplementation files(hermesPath + "hermes-debug.aar") diff --git a/ReactAndroid/src/debug/java/com/facebook/flipper/ReactNativeFlipper.java b/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java similarity index 89% rename from ReactAndroid/src/debug/java/com/facebook/flipper/ReactNativeFlipper.java rename to template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java index c2973ad5d2..64143d1dd7 100644 --- a/ReactAndroid/src/debug/java/com/facebook/flipper/ReactNativeFlipper.java +++ b/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.flipper; +package com.helloworld; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient; @@ -18,15 +18,12 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; import com.facebook.flipper.plugins.react.ReactFlipperPlugin; import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; -import com.facebook.react.BuildConfig; import com.facebook.react.modules.network.NetworkingModule; import okhttp3.OkHttpClient; public class ReactNativeFlipper { - public static final String CLASS_NAME = "com.facebook.flipper.ReactNativeFlipper"; - public static void initializeFlipper(Context context) { - if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(context)) { + if (FlipperUtils.shouldEnableFlipper(context)) { final FlipperClient client = AndroidFlipperClient.getInstance(context); client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults())); diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java index bd315af77c..74189a7ac6 100644 --- a/template/android/app/src/main/java/com/helloworld/MainApplication.java +++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java @@ -57,7 +57,7 @@ public class MainApplication extends Application implements ReactApplication { We use reflection here to pick up the class that initializes Flipper, since Flipper library is not available in release mode */ - Class aClass = Class.forName("com.facebook.flipper.ReactNativeFlipper"); + Class aClass = Class.forName("com.helloworld.ReactNativeFlipper"); aClass.getMethod("initializeFlipper", Context.class).invoke(null, context); } catch (ClassNotFoundException e) { e.printStackTrace(); diff --git a/template/android/gradle.properties b/template/android/gradle.properties index 95b56fe1e3..1ac72128ef 100644 --- a/template/android/gradle.properties +++ b/template/android/gradle.properties @@ -23,3 +23,6 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true + +# Version of flipper SDK to use with React Native +FLIPPER_VERSION=0.23.4