Skip to content

Commit

Permalink
[android][ios] Upgrade react-native-safe-area-context to 4.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
brentvatne committed Oct 4, 2022
1 parent 829e71a commit 16061a1
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 274 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.facebook.react.module.model.ReactModuleInfo
import com.facebook.react.module.model.ReactModuleInfoProvider
import com.facebook.react.turbomodule.core.interfaces.TurboModule
import com.facebook.react.uimanager.ViewManager
import com.facebook.soloader.SoLoader

// Fool autolinking for older versions that do not support TurboReactPackage.
// public class SafeAreaContextPackage implements ReactPackage {
Expand Down Expand Up @@ -40,13 +39,6 @@ class SafeAreaContextPackage : TurboReactPackage() {
}

override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// For Fabric, we load c++ native library here, this triggers screen's Fabric
// component registration which is necessary in order to avoid asking users
// to manually add init calls in their application code.
// This should no longer be needed if RN's autolink mechanism has Fabric support
SoLoader.loadLibrary("safeareacontext_modules")
}
return listOf<ViewManager<*, *>>(SafeAreaProviderManager(), SafeAreaViewManager())
}
}
10 changes: 5 additions & 5 deletions apps/bare-expo/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ PODS:
- React-Core
- react-native-viewpager (5.0.11):
- React-Core
- react-native-webview (11.22.4):
- react-native-webview (11.23.1):
- React-Core
- React-perflogger (0.70.1)
- React-RCTActionSheet (0.70.1):
Expand Down Expand Up @@ -710,7 +710,7 @@ PODS:
- React-Core
- RNCMaskedView (0.2.6):
- React-Core
- RNCPicker (2.4.2):
- RNCPicker (2.4.6):
- React-Core
- RNDateTimePicker (6.2.0):
- React-Core
Expand Down Expand Up @@ -1315,7 +1315,7 @@ SPEC CHECKSUMS:
FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
GoogleMLKit: 755661c46990a85e42278015f26400286d98ad95
Expand Down Expand Up @@ -1356,7 +1356,7 @@ SPEC CHECKSUMS:
react-native-slider: 98b724cd3e44c3454a6d0724e796d4e9c52189ce
react-native-view-shot: da768466e1cd371de50a3a5c722d1e95456b5b2c
react-native-viewpager: b99b53127d830885917ef84809c5065edd614a78
react-native-webview: a1ed211d50a5047a4fe54e07140991e277cd66e6
react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
React-perflogger: 48c6b363e867d64b682e84f80ca45636bd65e19c
React-RCTActionSheet: 33c74fe5c754835e3715c300618da9aa2f7203fa
React-RCTAnimation: 2dbf0120d4d1ab7716079b4180f2ca89c465e46b
Expand All @@ -1371,7 +1371,7 @@ SPEC CHECKSUMS:
ReactCommon: 7f86326b92009925c6dcf93f8e825060171c379f
RNCAsyncStorage: 466b9df1a14bccda91da86e0b7d9a345d78e1673
RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
RNCPicker: 0250e95ad170569a96f5b0555cdd5e65b9084dca
RNCPicker: 2f71e09c52ab6327e2c393213368ea0e5bfbcb65
RNDateTimePicker: 30e6733efc179d1e49d6008ea5fce42cdc9aeeca
RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e
Expand Down
2 changes: 1 addition & 1 deletion apps/bare-expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"react-native": "0.70.1",
"react-native-gesture-handler": "~2.5.0",
"react-native-reanimated": "~2.10.0",
"react-native-safe-area-context": "4.3.1",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.15.0",
"react-native-shared-element": "0.8.4",
"react-native-svg": "12.3.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/native-component-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"react-native-pager-view": "5.4.24",
"react-native-paper": "^4.0.1",
"react-native-reanimated": "~2.10.0",
"react-native-safe-area-context": "4.3.1",
"react-native-safe-area-context": "4.4.1",
"react-native-safe-area-view": "^0.14.8",
"react-native-screens": "~3.15.0",
"react-native-shared-element": "0.8.4",
Expand Down
2 changes: 1 addition & 1 deletion home/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react-native-maps": "0.31.1",
"react-native-paper": "^4.0.1",
"react-native-reanimated": "~2.10.0",
"react-native-safe-area-context": "4.3.1",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.15.0",
"react-redux": "^7.2.0",
"react-string-replace": "^0.4.4",
Expand Down
8 changes: 4 additions & 4 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1907,11 +1907,11 @@ PODS:
- React-Core
- react-native-pager-view (5.4.24):
- React-Core
- react-native-safe-area-context (4.3.1):
- react-native-safe-area-context (4.4.1):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React
- React-Core
- ReactCommon/turbomodule/core
- react-native-segmented-control (2.4.0):
- React-Core
Expand Down Expand Up @@ -3444,7 +3444,7 @@ SPEC CHECKSUMS:
FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
Google-Maps-iOS-Utils: c32891ff472eaaa1fca032beedafa1a013af7875
Google-Mobile-Ads-SDK: caf686ba55108412e02a3eedb136e12e488dbfaa
GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead
Expand Down Expand Up @@ -3492,7 +3492,7 @@ SPEC CHECKSUMS:
React-logger: 7bd569e3857d74ed412ce0a5c51f421ff7d4ca7f
react-native-netinfo: 129bd99f607a2dc5bb096168f3e5c150fd1f1c95
react-native-pager-view: 95d0418c3c74279840abec6926653d32447bafb6
react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-segmented-control: 06607462630512ff8eef652ec560e6235a30cc3e
react-native-skia: faacd6a970a757d67c4f4a44a31d347651abbb8e
react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#import "RNCSafeAreaContext.h"

#if __has_include(<SafeAreaContextSpec/SafeAreaContextSpec.h>)
#if __has_include(<safeareacontext/safeareacontext.h>)
#define RCT_USE_CODEGEN 1
#else
#define RCT_USE_CODEGEN 0
#endif

#import <UIKit/UIKit.h>
#import <React/RCTUtils.h>
#import <UIKit/UIKit.h>
#if RCT_USE_CODEGEN
#import <SafeAreaContextSpec/SafeAreaContextSpec.h>
#import <safeareacontext/safeareacontext.h>
#endif

#if RCT_USE_CODEGEN
Expand Down Expand Up @@ -62,7 +62,7 @@ - (NSDictionary *)getConstants
}
};
});

return constants;
}

Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 16061a1

Please sign in to comment.