Move ReactNativeFlipper class to template

Reviewed By: mdvacca Differential Revision: D6101369 fbshipit-source-id: e1ae8f57136dd568b7c14fa873a50bb490d73808
facebook · Sep 3, 2019 · 755ad3b · 755ad3b
1 parent 4bda2db
commit 755ad3b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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/.../facebook/flipper/ReactNativeFlipper.java → ...va/com/helloworld/ReactNativeFlipper.java b/.../facebook/flipper/ReactNativeFlipper.java → ...va/com/helloworld/ReactNativeFlipper.java
@@ -4,7 +4,7 @@
  * <p>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.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
@@ -57,7 +57,7 @@ private static void initializeFlipper(Context context) {
          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
@@ -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