From 51e37311d0261e34895ef7ba29bfd9b0aa054cb3 Mon Sep 17 00:00:00 2001 From: Joao Alves Date: Thu, 2 Jul 2020 04:03:37 -0700 Subject: [PATCH] Fix: Release builds on android (#1325) Summary: After `react-native-flipper` 0.48.0 I cannot build releases on android (I think that passed on CI tests because the example was running an older version of this package, 0.47.0). So I moved all the `android/src/main` content to `android/src/debug` because we will not use Flipper in another Build Variant ## Changelog I moved all content from `react-native-flipper/android/src/main` to `react-native-flipper/android/src/debug`. Probably solves https://github.com/facebook/flipper/issues/1303 Pull Request resolved: https://github.com/facebook/flipper/pull/1325 Test Plan: Maybe create a custom CI script to verify if Flipper deps are present on Release Builds, [something like this](https://github.com/facebook/flipper/issues/1274#issue-641197153) Reviewed By: cekkaewnumchai Differential Revision: D22333432 Pulled By: passy fbshipit-source-id: 4abbab5ecbe08d44752b2138569ff60d25724087 --- .../ReactNativeFlipperExample/android/gradle.properties | 2 +- react-native/ReactNativeFlipperExample/package.json | 2 +- .../android/src/debug/AndroidManifest.xml | 4 ++++ .../java/com/facebook/flipper/reactnative/FlipperModule.java | 0 .../java/com/facebook/flipper/reactnative/FlipperPackage.java | 0 .../reactnative/FlipperReactNativeJavaScriptPlugin.java | 0 .../FlipperReactNativeJavaScriptPluginManager.java | 0 .../reactnative/FlipperReactNativeJavaScriptReceiver.java | 0 8 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 react-native/react-native-flipper/android/src/debug/AndroidManifest.xml rename react-native/react-native-flipper/android/src/{main => debug}/java/com/facebook/flipper/reactnative/FlipperModule.java (100%) rename react-native/react-native-flipper/android/src/{main => debug}/java/com/facebook/flipper/reactnative/FlipperPackage.java (100%) rename react-native/react-native-flipper/android/src/{main => debug}/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java (100%) rename react-native/react-native-flipper/android/src/{main => debug}/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java (100%) rename react-native/react-native-flipper/android/src/{main => debug}/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptReceiver.java (100%) diff --git a/react-native/ReactNativeFlipperExample/android/gradle.properties b/react-native/ReactNativeFlipperExample/android/gradle.properties index dd13b1eb6..b32539bfa 100644 --- a/react-native/ReactNativeFlipperExample/android/gradle.properties +++ b/react-native/ReactNativeFlipperExample/android/gradle.properties @@ -30,4 +30,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.47.0 +FLIPPER_VERSION=0.49.0 diff --git a/react-native/ReactNativeFlipperExample/package.json b/react-native/ReactNativeFlipperExample/package.json index 7b4b17029..941333854 100644 --- a/react-native/ReactNativeFlipperExample/package.json +++ b/react-native/ReactNativeFlipperExample/package.json @@ -12,7 +12,7 @@ "dependencies": { "react": "^16.13", "react-native": "^0.62.2", - "react-native-flipper": "^0.47.0" + "react-native-flipper": "^0.49.0" }, "devDependencies": { "@babel/core": "^7.6.2", diff --git a/react-native/react-native-flipper/android/src/debug/AndroidManifest.xml b/react-native/react-native-flipper/android/src/debug/AndroidManifest.xml new file mode 100644 index 000000000..1c6dff160 --- /dev/null +++ b/react-native/react-native-flipper/android/src/debug/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperModule.java b/react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperModule.java similarity index 100% rename from react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperModule.java rename to react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperModule.java diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperPackage.java b/react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperPackage.java similarity index 100% rename from react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperPackage.java rename to react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperPackage.java diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java b/react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java similarity index 100% rename from react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java rename to react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java b/react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java similarity index 100% rename from react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java rename to react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptReceiver.java b/react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptReceiver.java similarity index 100% rename from react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptReceiver.java rename to react-native/react-native-flipper/android/src/debug/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptReceiver.java