Skip to content

Commit 07577e3

Browse files
markdevochtmarkdevocht
authored
RN 0.85.2 Upgrade (#8280)
* RN 0.85.2 implementation * update * meta space update * podfile update
1 parent b815fa4 commit 07577e3

16 files changed

Lines changed: 668 additions & 557 deletions

File tree

‎.buildkite/jobs/pipeline.android_rn_85.yml‎

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

‎.buildkite/jobs/pipeline.ios_rn_85.yml‎

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

‎.buildkite/pipeline.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ 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
1010
cat .buildkite/jobs/pipeline.android_rn_84.yml
11+
cat .buildkite/jobs/pipeline.android_rn_85.yml
1112
cat .buildkite/jobs/pipeline.ios_rn_77.yml
1213
cat .buildkite/jobs/pipeline.ios_rn_78.yml
1314
cat .buildkite/jobs/pipeline.ios_rn_82.yml
1415
cat .buildkite/jobs/pipeline.ios_rn_83.yml
1516
cat .buildkite/jobs/pipeline.ios_rn_84.yml
17+
cat .buildkite/jobs/pipeline.ios_rn_85.yml
1618
cat .buildkite/jobs/pipeline.publish.yml

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66

77
public class DevBundleDownloadListenerAdapter implements DevBundleDownloadListener, NavigationDevBundleDownloadListener {
88
@Override
9-
public void onSuccess() {
10-
onSuccess();
11-
}
9+
public void onSuccess() {}
1210

13-
@Override
1411
public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
15-
12+
onProgress(status, done, total, null);
1613
}
1714

18-
@Override
19-
public void onFailure(Exception cause) {
15+
public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total, @Nullable Integer totalDone) {}
2016

21-
}
17+
@Override
18+
public void onFailure(Exception cause) {}
2219
}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66

77
public class JsDevReloadHandlerFacade implements DevBundleDownloadListener, NavigationDevBundleDownloadListener {
88
@Override
9-
public void onSuccess() {
10-
onSuccess();
11-
}
9+
public void onSuccess() {}
1210

13-
@Override
1411
public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
15-
12+
onProgress(status, done, total, null);
1613
}
1714

18-
@Override
19-
public void onFailure(Exception cause) {
15+
public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total, @Nullable Integer totalDone) {}
2016

21-
}
17+
@Override
18+
public void onFailure(Exception cause) {}
2219
}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66

77
public abstract class ReloadHandlerFacade implements DevBundleDownloadListener {
88
@Override
9-
public void onSuccess() {
9+
public void onSuccess() {}
1010

11-
}
12-
13-
@Override
1411
public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
15-
12+
onProgress(status, done, total, null);
1613
}
1714

18-
@Override
19-
public void onFailure(Exception cause) {
15+
public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total, @Nullable Integer totalDone) {}
2016

21-
}
17+
@Override
18+
public void onFailure(Exception cause) {}
2219
}

‎jest.config.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
let preset = 'react-native';
2+
try {
3+
require.resolve('@react-native/jest-preset');
4+
preset = '@react-native/jest-preset';
5+
} catch (_) {}
6+
17
module.exports = {
2-
preset: 'react-native',
8+
preset,
39
transformIgnorePatterns: [
410
'node_modules/(?!(@react-native|react-native|react-native-ui-lib|react-native-animatable|react-native-reanimated|react-native-webview)/)',
511
],

‎package.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,16 @@
9595
"@babel/runtime": "^7.25.0",
9696
"@babel/types": "7.25.0",
9797
"@d11/react-native-fast-image": "^8.13.0",
98-
"@react-native-community/cli": "20.0.0",
99-
"@react-native-community/cli-platform-android": "20.0.0",
100-
"@react-native-community/cli-platform-ios": "20.0.0",
98+
"@react-native-community/cli": "20.1.0",
99+
"@react-native-community/cli-platform-android": "20.1.0",
100+
"@react-native-community/cli-platform-ios": "20.1.0",
101101
"@react-native-community/datetimepicker": "^8.2.0",
102102
"@react-native-community/netinfo": "^11.4.1",
103-
"@react-native/babel-preset": "0.84.0",
104-
"@react-native/eslint-config": "0.84.0",
105-
"@react-native/metro-config": "0.84.0",
106-
"@react-native/typescript-config": "0.84.0",
103+
"@react-native/babel-preset": "0.85.2",
104+
"@react-native/eslint-config": "0.85.2",
105+
"@react-native/jest-preset": "0.85.2",
106+
"@react-native/metro-config": "0.85.2",
107+
"@react-native/typescript-config": "0.85.2",
107108
"@testing-library/jest-native": "^5.4.2",
108109
"@testing-library/react-native": "^13.0.1",
109110
"@types/hoist-non-react-statics": "^3.3.6",
@@ -131,11 +132,11 @@
131132
"pngjs": "^6.0.0",
132133
"prettier": "2.8.8",
133134
"react": "19.2.3",
134-
"react-native": "0.84.0",
135+
"react-native": "0.85.2",
135136
"react-native-builder-bob": "^0.40.13",
136137
"react-native-gesture-handler": "^2.29.1",
137-
"react-native-reanimated": "4.2.2",
138-
"react-native-worklets": "0.7.4",
138+
"react-native-reanimated": "4.3.0",
139+
"react-native-worklets": "0.8.1",
139140
"react-redux": "9.1.2",
140141
"react-test-renderer": "19.2.3",
141142
"redux": "^5.0.1",

‎playground/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx10248m -XX:MaxPermSize=256m
1313
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14-
org.gradle.jvmargs=-Xmx2048m
14+
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
1515
# org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1616

1717
# When configured, Gradle will run in incubating parallel mode.

‎playground/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Jul 28 13:48:47 IDT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)