Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[android][ios] Upgrade react-native-safe-area-context to 4.4.1 #19401

Merged
merged 4 commits into from Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,7 @@ Package-specific changes not released in any SDK will be added here just before

### 📚 3rd party library updates

- Updated `react-native-safe-area-context` from `4.3.1` to `4.4.1`. ([#19055](https://github.com/expo/expo/pull/19401) by [@brentvatne](https://github.com/brentvatne))
- Updated `@stripe/stripe-react-native` from `0.13.1` to `0.18.1` on iOS. ([#19055](https://github.com/expo/expo/pull/19055) by [@tsapeta](https://github.com/tsapeta))
- Updated `@shopify/flash-list` from `1.1.0` to `1.3.0`. ([#19317](https://github.com/expo/expo/pull/19317) by [@kudo](https://github.com/kudo))
- Updated `react-native-view-shot` from `3.3.0` to `3.4.0`. ([#19405](https://github.com/expo/expo/pull/19405) by [@douglowder](https://github.com/douglowder))
Expand Down
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
Expand Up @@ -624,11 +624,11 @@ PODS:
- glog
- react-native-netinfo (9.3.3):
- 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 @@ -712,7 +712,7 @@ PODS:
- React-Core
- RNCPicker (2.4.6):
- React-Core
- RNDateTimePicker (6.2.0):
- RNDateTimePicker (6.5.0):
- React-Core
- RNGestureHandler (2.7.0):
- React-Core
Expand Down Expand Up @@ -1351,7 +1351,7 @@ SPEC CHECKSUMS:
React-jsinspector: 26c42646ab0bb69e29e837e23754fe7121eeaf94
React-logger: 1bfd109a0ffa4c0989bbfac0c2d8c4abe4637faa
react-native-netinfo: b514dd6d9cd512b90e178c5b7158df1a1c568d47
react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-segmented-control: 06607462630512ff8eef652ec560e6235a30cc3e
react-native-slider: 98b724cd3e44c3454a6d0724e796d4e9c52189ce
react-native-view-shot: a60a98a18c72bcaaaf2138f9aab960ae9b0d96c7
Expand All @@ -1372,7 +1372,7 @@ SPEC CHECKSUMS:
RNCAsyncStorage: 466b9df1a14bccda91da86e0b7d9a345d78e1673
RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
RNCPicker: 2f71e09c52ab6327e2c393213368ea0e5bfbcb65
RNDateTimePicker: 30e6733efc179d1e49d6008ea5fce42cdc9aeeca
RNDateTimePicker: 154f8246e9c32fd663995647a7f9f667a8c6b258
RNGestureHandler: 7673697e7c0e9391adefae4faa087442bc04af33
RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e
RNScreens: f3230dd008a7d0ce5c0a8bc78ff12cf2315bda24
Expand Down
2 changes: 1 addition & 1 deletion apps/bare-expo/package.json
Expand Up @@ -114,7 +114,7 @@
"react-native": "0.70.2",
"react-native-gesture-handler": "~2.7.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.18.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
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.18.0",
"react-native-shared-element": "0.8.4",
Expand Down
2 changes: 1 addition & 1 deletion home/package.json
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.18.0",
"react-redux": "^7.2.0",
"react-string-replace": "^0.4.4",
Expand Down
6 changes: 3 additions & 3 deletions ios/Podfile.lock
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 @@ -3492,7 +3492,7 @@ SPEC CHECKSUMS:
React-logger: 1bfd109a0ffa4c0989bbfac0c2d8c4abe4637faa
react-native-netinfo: b514dd6d9cd512b90e178c5b7158df1a1c568d47
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: 78330615997e720dd07db28f4b8dfff22e9dd031
react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
Expand Down
@@ -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.