Skip to content

Commit f07ab6c

Browse files
author
Mark de Vocht
committed
RN 0.85.2 implementation
1 parent 0ab840a commit f07ab6c

14 files changed

Lines changed: 629 additions & 522 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
preset: 'react-native',
2+
preset: '@react-native/jest-preset',
33
transformIgnorePatterns: [
44
'node_modules/(?!(@react-native|react-native|react-native-ui-lib|react-native-animatable|react-native-reanimated|react-native-webview)/)',
55
],

‎package.json‎

Lines changed: 12 additions & 11 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",
@@ -182,4 +183,4 @@
182183
]
183184
]
184185
}
185-
}
186+
}

‎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

‎playground/ios/playground.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -681,13 +681,11 @@
681681
);
682682
inputPaths = (
683683
"${PODS_ROOT}/Target Support Files/Pods-playground/Pods-playground-frameworks.sh",
684-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/React-Core-prebuilt/React.framework/React",
685684
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ReactNativeDependencies/ReactNativeDependencies.framework/ReactNativeDependencies",
686685
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermesvm.framework/hermesvm",
687686
);
688687
name = "[CP] Embed Pods Frameworks";
689688
outputPaths = (
690-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
691689
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactNativeDependencies.framework",
692690
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermesvm.framework",
693691
);
@@ -705,11 +703,13 @@
705703
"${PODS_ROOT}/Target Support Files/Pods-playground/Pods-playground-resources.sh",
706704
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
707705
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
706+
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
708707
);
709708
name = "[CP] Copy Pods Resources";
710709
outputPaths = (
711710
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
712711
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
712+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
713713
);
714714
runOnlyForDeploymentPostprocessing = 0;
715715
shellPath = /bin/sh;
@@ -767,13 +767,11 @@
767767
);
768768
inputPaths = (
769769
"${PODS_ROOT}/Target Support Files/Pods-NavigationIOS12Tests/Pods-NavigationIOS12Tests-frameworks.sh",
770-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/React-Core-prebuilt/React.framework/React",
771770
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ReactNativeDependencies/ReactNativeDependencies.framework/ReactNativeDependencies",
772771
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermesvm.framework/hermesvm",
773772
);
774773
name = "[CP] Embed Pods Frameworks";
775774
outputPaths = (
776-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
777775
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactNativeDependencies.framework",
778776
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermesvm.framework",
779777
);
@@ -791,11 +789,13 @@
791789
"${PODS_ROOT}/Target Support Files/Pods-NavigationTests/Pods-NavigationTests-resources.sh",
792790
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
793791
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
792+
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
794793
);
795794
name = "[CP] Copy Pods Resources";
796795
outputPaths = (
797796
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
798797
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
798+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
799799
);
800800
runOnlyForDeploymentPostprocessing = 0;
801801
shellPath = /bin/sh;
@@ -809,13 +809,11 @@
809809
);
810810
inputPaths = (
811811
"${PODS_ROOT}/Target Support Files/Pods-NavigationTests/Pods-NavigationTests-frameworks.sh",
812-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/React-Core-prebuilt/React.framework/React",
813812
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ReactNativeDependencies/ReactNativeDependencies.framework/ReactNativeDependencies",
814813
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermesvm.framework/hermesvm",
815814
);
816815
name = "[CP] Embed Pods Frameworks";
817816
outputPaths = (
818-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
819817
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactNativeDependencies.framework",
820818
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermesvm.framework",
821819
);
@@ -833,11 +831,13 @@
833831
"${PODS_ROOT}/Target Support Files/Pods-SnapshotTests/Pods-SnapshotTests-resources.sh",
834832
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
835833
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
834+
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
836835
);
837836
name = "[CP] Copy Pods Resources";
838837
outputPaths = (
839838
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
840839
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
840+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
841841
);
842842
runOnlyForDeploymentPostprocessing = 0;
843843
shellPath = /bin/sh;
@@ -873,13 +873,11 @@
873873
);
874874
inputPaths = (
875875
"${PODS_ROOT}/Target Support Files/Pods-SnapshotTests/Pods-SnapshotTests-frameworks.sh",
876-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/React-Core-prebuilt/React.framework/React",
877876
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ReactNativeDependencies/ReactNativeDependencies.framework/ReactNativeDependencies",
878877
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermesvm.framework/hermesvm",
879878
);
880879
name = "[CP] Embed Pods Frameworks";
881880
outputPaths = (
882-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
883881
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactNativeDependencies.framework",
884882
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermesvm.framework",
885883
);
@@ -897,11 +895,13 @@
897895
"${PODS_ROOT}/Target Support Files/Pods-NavigationIOS12Tests/Pods-NavigationIOS12Tests-resources.sh",
898896
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
899897
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
898+
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
900899
);
901900
name = "[CP] Copy Pods Resources";
902901
outputPaths = (
903902
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
904903
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
904+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
905905
);
906906
runOnlyForDeploymentPostprocessing = 0;
907907
shellPath = /bin/sh;

0 commit comments

Comments
 (0)