From 80584dac88221f24765c12e4d8173b00af183443 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Wed, 22 Jan 2020 09:40:03 +0000 Subject: [PATCH 1/2] [Android][RNTester] Use new Flipper SDK --- RNTester/android/app/build.gradle | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index b8a6437d7b4441..a1f7cfbc7fa430 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -170,10 +170,16 @@ dependencies { debugImplementation files(hermesPath + "hermes-debug.aar") releaseImplementation files(hermesPath + "hermes-release.aar") - debugImplementation("com.facebook.flipper:flipper:0.23.4") { - exclude group:'com.facebook.yoga' - exclude group:'com.facebook.flipper', module: 'fbjni' - exclude group:'com.facebook.litho', module: 'litho-annotations' + debugImplementation("com.facebook.flipper:flipper:0.30.2") { + exclude group:'com.facebook.fbjni' + } + + debugImplementation("com.facebook.flipper:flipper-network-plugin:0.30.2") { + exclude group:'com.facebook.flipper' + } + + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:0.30.2") { + exclude group:'com.facebook.flipper' } if (useIntlJsc) { From 3e2281c728054b427085c85202abf0e162d0129c Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Wed, 22 Jan 2020 14:37:20 +0000 Subject: [PATCH 2/2] Update Flipper in template Summary: Same steps as in RNTester. Test Plan: react-native init --version 0.62.0-rc.0 Effectively made the same changes as below. Compiles but currently doesn't run because of an unrelated crash: ``` 14:35:54.053 AndroidRuntime FATAL EXCEPTION: mqt_native_modules Process: com.testproj, PID: 29797 java.lang.NoClassDefFoundError: Failed resolution of: Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; at com.facebook.react.shell.MainReactPackage.createViewManagers(MainReactPackage.java:190) at com.facebook.react.ReactInstanceManager.getOrCreateViewManagers(ReactInstanceManager.java:830) at com.facebook.react.CoreModulesPackage.createUIManager(CoreModulesPackage.java:189) at com.facebook.react.CoreModulesPackage.getModule(CoreModulesPackage.java:157) at com.facebook.react.TurboReactPackage$ModuleHolderProvider.get(TurboReactPackage.java:159) at com.facebook.react.TurboReactPackage$ModuleHolderProvider.get(TurboReactPackage.java:147) at com.facebook.react.bridge.ModuleHolder.create(ModuleHolder.java:191) at com.facebook.react.bridge.ModuleHolder.getModule(ModuleHolder.java:156) at com.facebook.react.bridge.NativeModuleRegistry.getModule(NativeModuleRegistry.java:149) at com.facebook.react.bridge.CatalystInstanceImpl.getNativeModule(CatalystInstanceImpl.java:590) at com.facebook.react.bridge.CatalystInstanceImpl.getNativeModule(CatalystInstanceImpl.java:567) at com.facebook.react.uimanager.UIManagerHelper.getUIManager(UIManagerHelper.java:42) at com.facebook.react.ReactInstanceManager.attachRootViewToInstance(ReactInstanceManager.java:1111) at com.facebook.react.ReactInstanceManager.setupReactContext(ReactInstanceManager.java:1057) at com.facebook.react.ReactInstanceManager.access$1400(ReactInstanceManager.java:132) at com.facebook.react.ReactInstanceManager$5$2.run(ReactInstanceManager.java:1017) at android.os.Handler.handleCallback(Handler.java:883) at android.os.Handler.dispatchMessage(Handler.java:100) at com.facebook.react.bridge.queue.MessageQueueThreadHandler.dispatchMessage(MessageQueueThreadHandler.java:27) at android.os.Looper.loop(Looper.java:214) at com.facebook.react.bridge.queue.MessageQueueThreadImpl$4.run(MessageQueueThreadImpl.java:226) at java.lang.Thread.run(Thread.java:919) Caused by: java.lang.ClassNotFoundException: Didn't find class "androidx.swiperefreshlayout.widget.SwipeRefreshLayout" on path: DexPathList[[zip file "/data/app/com.testproj-aGTaaMSONCephW7Vd5X-lA==/base.apk"],nativeLibraryDirectories=[/data/app/com.testproj-aGTaaMSONCephW7Vd5X-lA==/lib/x86, /data/app/com.testproj-aGTaaMSONCephW7Vd5X-lA==/base.apk!/lib/x86, /system/lib, /system/product/lib]] at dalvik.system.BaseDexClassLoader.findClass(BaseDexClassLoader.java:196) at java.lang.ClassLoader.loadClass(ClassLoader.java:379) at java.lang.ClassLoader.loadClass(ClassLoader.java:312) ... 22 more ``` --- template/android/app/build.gradle | 12 +++++++++--- template/android/gradle.properties | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index 03fcdf3196c5b6..c37992781556a9 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -193,9 +193,15 @@ dependencies { 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' + exclude group:'com.facebook.fbjni' + } + + debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { + exclude group:'com.facebook.flipper' + } + + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { + exclude group:'com.facebook.flipper' } if (enableHermes) { diff --git a/template/android/gradle.properties b/template/android/gradle.properties index 1ac72128ef549b..06a2e7b32d123c 100644 --- a/template/android/gradle.properties +++ b/template/android/gradle.properties @@ -25,4 +25,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.23.4 +FLIPPER_VERSION=0.30.2