Skip to content

Commit 39db20f

Browse files
authored
Updating react-native to 0.70.15 (#23279)
### Description Updating react-native to 0.70.15 ### Motivation and Context To address the issue with the failed checksum after boost switching URL from Jfrog
1 parent 6550f4b commit 39db20f

File tree

12 files changed

+1060
-2286
lines changed

12 files changed

+1060
-2286
lines changed

js/react_native/e2e/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath('com.android.tools.build:gradle:7.1.1')
16+
classpath('com.android.tools.build:gradle:7.2.1')
1717
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj

+130-6
Large diffs are not rendered by default.

js/react_native/e2e/ios/Podfile

+20-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,17 @@ end
1515
target 'OnnxruntimeModuleExample' do
1616
config = use_native_modules!
1717

18-
use_react_native!(:path => config["reactNativePath"])
18+
use_react_native!(
19+
:path => config[:reactNativePath],
20+
21+
# Hermes is now enabled by default. Disable by setting this flag to false.
22+
# Upcoming versions of React Native may rely on get_default_flags(), but
23+
# we make it explicit here to aid in the React Native upgrade process.
24+
25+
:hermes_enabled => false,
26+
# :flipper_configuration => FlipperConfiguration.enabled,
27+
:app_path => "#{Pod::Config.instance.installation_root}/.."
28+
)
1929

2030
use_frameworks!
2131

@@ -27,13 +37,13 @@ target 'OnnxruntimeModuleExample' do
2737
pod 'onnxruntime-react-native', :path => '../node_modules/onnxruntime-react-native'
2838

2939
inherit! :search_paths
30-
end
31-
post_install do |installer|
32-
installer.generated_projects.each do |project|
33-
project.targets.each do |target|
34-
target.build_configurations.each do |config|
35-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
36-
end
37-
end
38-
end
40+
post_install do |installer|
41+
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
42+
react_native_post_install(
43+
installer,
44+
config[:reactNativePath],
45+
:mac_catalyst_enabled => false,
46+
)
47+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
48+
end
3949
end

js/react_native/e2e/ios/main.jsbundle

-404
This file was deleted.

js/react_native/e2e/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"react": "^18.1.0",
13-
"react-native": "^0.69.1",
13+
"react-native": "^0.70.15",
1414
"react-native-fs": "^2.20.0"
1515
},
1616
"devDependencies": {
@@ -19,6 +19,6 @@
1919
"babel-plugin-module-resolver": "^4.0.0",
2020
"detox": "^20.7.0",
2121
"jest": "^29",
22-
"metro-react-native-babel-preset": "^0.67.0"
22+
"metro-react-native-babel-preset": "0.72.4"
2323
}
2424
}

js/react_native/e2e/test/jest.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module.exports = {
33
rootDir: '..',
44
testMatch: ['<rootDir>/test/**/*.test.js'],
5-
testTimeout: 120000,
5+
testTimeout: 240000,
66
maxWorkers: 1,
77
globalSetup: 'detox/runners/jest/globalSetup',
88
globalTeardown: 'detox/runners/jest/globalTeardown',

0 commit comments

Comments
 (0)