Skip to content

Commit 45ebe9e

Browse files
committed
android: Follow upstream template re Flipper
This squashes three small Flipper-related commits as they affect the template RN app between RN v0.67.4 and v0.68.5: facebook/react-native@ce74aa4ed Add ReactInstanceEventListener for Venice and expose in FbReactInstanceHolder facebook/react-native@8bd3edec8 Update copyright headers from Facebook to Meta facebook/react-native@50057158c Bump Flipper to 0.125.0 The change touching ReactNativeFlipper.java requires the RN v0.68 upgrade in order to compile, so we do it after the upgrade.
1 parent a2ab361 commit 45ebe9e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

android/app/src/debug/java/com/zulipmobile/ReactNativeFlipper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) Facebook, Inc. and its affiliates.
2+
* Copyright (c) Meta Platforms, Inc. and its affiliates.
33
*
44
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
55
* directory of this source tree.
@@ -19,6 +19,7 @@
1919
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
2020
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
2121
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
22+
import com.facebook.react.ReactInstanceEventListener;
2223
import com.facebook.react.ReactInstanceManager;
2324
import com.facebook.react.bridge.ReactContext;
2425
import com.facebook.react.modules.network.NetworkingModule;
@@ -51,7 +52,7 @@ public void apply(OkHttpClient.Builder builder) {
5152
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
5253
if (reactContext == null) {
5354
reactInstanceManager.addReactInstanceEventListener(
54-
new ReactInstanceManager.ReactInstanceEventListener() {
55+
new ReactInstanceEventListener() {
5556
@Override
5657
public void onReactContextInitialized(ReactContext reactContext) {
5758
reactInstanceManager.removeReactInstanceEventListener(this);

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android.useAndroidX=true
2828
android.enableJetifier=true
2929

3030
# Version of flipper SDK to use with React Native
31-
FLIPPER_VERSION=0.99.0
31+
FLIPPER_VERSION=0.125.0
3232

3333
# Use this property to specify which architecture you want to build.
3434
# You can also override it from the CLI using

0 commit comments

Comments
 (0)