Skip to content

Commit 5c25781

Browse files
markdevochtmarkdevocht
authored
Upgrade to RN 0.84 (#8244)
* iOS part * Ci update * added some missing parts for android * yarn lock update
1 parent ca3ead3 commit 5c25781

25 files changed

Lines changed: 1859 additions & 1923 deletions

‎.buildkite/jobs/pipeline.android_rn_83.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
- label: ":android: Android (RN 0.83.0)"
1+
- label: ":android: Android (RN 0.83.2)"
22
env:
33
JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
4-
REACT_NATIVE_VERSION: 0.83.0
4+
REACT_NATIVE_VERSION: 0.83.2
55
command:
66
- "nvm install"
77
- "./scripts/ci.android.sh"

‎.buildkite/jobs/pipeline.android_rn_84.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
- label: ":android: Android (RN 0.84.0)"
2+
env:
3+
JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
4+
REACT_NATIVE_VERSION: 0.84.0
5+
command:
6+
- "nvm install"
7+
- "./scripts/ci.android.sh"
8+
key: "android_rn_84"
9+
timeout_in_minutes: 90
10+
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
11+
12+

‎.buildkite/jobs/pipeline.ios_rn_83.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
- label: ":ios: iOS (RN 0.83.0)"
1+
- label: ":ios: iOS (RN 0.83.2)"
22
env:
3-
REACT_NATIVE_VERSION: 0.83.0
3+
REACT_NATIVE_VERSION: 0.83.2
44
command:
55
- "nvm install"
66
- "./scripts/ci.ios.sh"

‎.buildkite/jobs/pipeline.ios_rn_84.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- label: ":ios: iOS (RN 0.84.0)"
2+
env:
3+
REACT_NATIVE_VERSION: 0.84.0
4+
command:
5+
- "nvm install"
6+
- "./scripts/ci.ios.sh"
7+
key: "ios_rn_84"
8+
timeout_in_minutes: 90
9+
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
10+
11+

‎.buildkite/pipeline.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ cat .buildkite/jobs/pipeline.android_rn_77.yml
77
cat .buildkite/jobs/pipeline.android_rn_78.yml
88
cat .buildkite/jobs/pipeline.android_rn_82.yml
99
cat .buildkite/jobs/pipeline.android_rn_83.yml
10+
cat .buildkite/jobs/pipeline.android_rn_84.yml
1011
cat .buildkite/jobs/pipeline.ios_rn_77.yml
1112
cat .buildkite/jobs/pipeline.ios_rn_78.yml
1213
cat .buildkite/jobs/pipeline.ios_rn_82.yml
1314
cat .buildkite/jobs/pipeline.ios_rn_83.yml
15+
cat .buildkite/jobs/pipeline.ios_rn_84.yml
1416
cat .buildkite/jobs/pipeline.publish.yml

‎android/src/main/java/com/reactnativenavigation/react/NavigationModule.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ protected NavigationActivity activity() {
232232
}
233233

234234
@Override
235-
public void onCatalystInstanceDestroy() {
235+
public void invalidate() {
236236
final NavigationActivity navigationActivity = activity();
237237
if (navigationActivity != null) {
238238
navigationActivity.onCatalystInstanceDestroy();
239239
}
240-
super.onCatalystInstanceDestroy();
240+
super.invalidate();
241241
}
242242
}

‎ios/RCTHelpers.mm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#import "RCTHelpers.h"
22
#import <React/RCTFont.h>
3+
#if __has_include(<React/RCTScrollView.h>)
34
#import <React/RCTScrollView.h>
5+
#endif
46
#import <React/RCTView.h>
57

68
@implementation RCTHelpers
@@ -201,7 +203,7 @@ + (BOOL)removeYellowBox:(RCTRootView *)reactRootView {
201203
UIView *yelloboxParentView = view;
202204
while (view.superview != nil) {
203205
yelloboxParentView = yelloboxParentView.superview;
204-
if ([yelloboxParentView isKindOfClass:[RCTScrollView class]]) {
206+
if ([yelloboxParentView isKindOfClass:NSClassFromString(@"RCTScrollView")]) {
205207
yelloboxParentView = yelloboxParentView.superview;
206208
break;
207209
}

‎ios/RNNAppDelegate.mm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@
55

66
#import "RCTAppSetupUtils.h"
77
#import <React/CoreModulesPlugins.h>
8+
#if __has_include(<React/RCTCxxBridgeDelegate.h>)
89
#import <React/RCTCxxBridgeDelegate.h>
10+
#endif
911
#import <React/RCTLegacyViewManagerInteropComponentView.h>
1012
#import <React/RCTSurfacePresenter.h>
13+
#if __has_include(<React/RCTSurfacePresenterStub.h>)
1114
#import <React/RCTSurfacePresenterStub.h>
15+
#endif
16+
#if __has_include(<React/RCTSurfacePresenterBridgeAdapter.h>)
1217
#import <React/RCTSurfacePresenterBridgeAdapter.h>
18+
#endif
1319
#import <ReactCommon/RCTTurboModuleManager.h>
1420

1521
#if __has_include(<react/config/ReactNativeConfig.h>)
@@ -19,9 +25,13 @@
1925
#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
2026
#import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
2127
#import <React/RCTSurfacePresenter.h>
28+
#if __has_include(<React/RCTBridge+Private.h>)
2229
#import <React/RCTBridge+Private.h>
30+
#endif
2331
#import <React/RCTImageLoader.h>
32+
#if __has_include(<React/RCTBridgeProxy.h>)
2433
#import <React/RCTBridgeProxy.h>
34+
#endif
2535
#import <React/RCTSurfacePresenter.h>
2636
#import <react/utils/ManagedObjectWrapper.h>
2737

‎ios/RNNBridgeManager.mm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,10 @@ - (void)onJavaScriptWillLoad {
107107

108108
- (void)onJavaScriptLoaded {
109109
[_commandsHandler setReadyToReceiveCommands:true];
110+
#ifndef RCT_REMOVE_LEGACY_ARCH
110111
[_modalHostViewHandler
111112
connectModalHostViewManager:[self.bridge moduleForClass:RCTModalHostViewManager.class]];
113+
#endif
112114
[[_bridge moduleForClass:[RNNBridgeEventEmitter class]] sendOnAppLaunched];
113115
}
114116

‎ios/RNNModalHostViewManagerHandler.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#import "RNNModalManager.h"
22
#import <Foundation/Foundation.h>
3+
4+
#ifndef RCT_REMOVE_LEGACY_ARCH
35
#import <React/RCTModalHostViewManager.h>
6+
#endif
47

58
@interface RNNModalHostViewManagerHandler : NSObject
69

710
- (instancetype)initWithModalManager:(RNNModalManager *)modalManager;
811

12+
#ifndef RCT_REMOVE_LEGACY_ARCH
913
- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager;
14+
#endif
1015

1116
@end

0 commit comments

Comments
 (0)