From 155cbc7383f8b85d26d3438d0b1646a6e26b6710 Mon Sep 17 00:00:00 2001 From: Parsa Nasirimehr Date: Sun, 4 Feb 2024 21:35:53 +0100 Subject: [PATCH] chore: revert bridgeless config on example apps --- .../lottie/rnexamplefabric/MainApplication.kt | 2 +- apps/fabric/ios/example.xcodeproj/project.pbxproj | 12 ++---------- apps/fabric/ios/example/AppDelegate.mm | 5 ----- .../src/specs/LottieAnimationViewNativeComponent.ts | 9 +++------ 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexamplefabric/MainApplication.kt b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexamplefabric/MainApplication.kt index b601341c..a0a9ce78 100644 --- a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexamplefabric/MainApplication.kt +++ b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexamplefabric/MainApplication.kt @@ -38,7 +38,7 @@ class MainApplication : Application(), ReactApplication { SoLoader.init(this, false) if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. - load(bridgelessEnabled = true) + load() } ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager) } diff --git a/apps/fabric/ios/example.xcodeproj/project.pbxproj b/apps/fabric/ios/example.xcodeproj/project.pbxproj index 65b2e8d5..3f1e6fab 100644 --- a/apps/fabric/ios/example.xcodeproj/project.pbxproj +++ b/apps/fabric/ios/example.xcodeproj/project.pbxproj @@ -923,11 +923,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -1003,11 +999,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/apps/fabric/ios/example/AppDelegate.mm b/apps/fabric/ios/example/AppDelegate.mm index 50b940d8..2fe06d1a 100644 --- a/apps/fabric/ios/example/AppDelegate.mm +++ b/apps/fabric/ios/example/AppDelegate.mm @@ -19,11 +19,6 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge return [self getBundleURL]; } -- (BOOL)bridgelessEnabled -{ - return YES; -} - - (NSURL *)getBundleURL { #if DEBUG diff --git a/packages/core/src/specs/LottieAnimationViewNativeComponent.ts b/packages/core/src/specs/LottieAnimationViewNativeComponent.ts index 3dc70d87..46462161 100644 --- a/packages/core/src/specs/LottieAnimationViewNativeComponent.ts +++ b/packages/core/src/specs/LottieAnimationViewNativeComponent.ts @@ -55,16 +55,13 @@ export interface NativeProps extends ViewProps { textFiltersAndroid?: ReadonlyArray; textFiltersIOS?: ReadonlyArray; onAnimationFinish?: BubblingEventHandler< - OnAnimationFinishEvent, - 'onAnimationFinish' + OnAnimationFinishEvent >; onAnimationFailure?: BubblingEventHandler< - AnimationFailureEvent, - 'onAnimationFailure' + AnimationFailureEvent >; onAnimationLoaded?: BubblingEventHandler< - AnimationLoadedEvent, - 'onAnimationLoaded' + AnimationLoadedEvent >; }