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

Updating react-native to 0.70.15 #23279

Merged
merged 21 commits into from
Jan 14, 2025
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/react_native/e2e/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath('com.android.tools.build:gradle:7.1.1')
classpath('com.android.tools.build:gradle:7.2.1')
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

Large diffs are not rendered by default.

30 changes: 20 additions & 10 deletions js/react_native/e2e/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ end
target 'OnnxruntimeModuleExample' do
config = use_native_modules!

use_react_native!(:path => config["reactNativePath"])
use_react_native!(
:path => config[:reactNativePath],

# Hermes is now enabled by default. Disable by setting this flag to false.
# Upcoming versions of React Native may rely on get_default_flags(), but
# we make it explicit here to aid in the React Native upgrade process.

:hermes_enabled => false,
# :flipper_configuration => FlipperConfiguration.enabled,
:app_path => "#{Pod::Config.instance.installation_root}/.."
)

use_frameworks!

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

inherit! :search_paths
end
post_install do |installer|
installer.generated_projects.each do |project|
project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
end
end
end
post_install do |installer|
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
jchen351 marked this conversation as resolved.
Show resolved Hide resolved
react_native_post_install(
installer,
config[:reactNativePath],
:mac_catalyst_enabled => false,
)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
404 changes: 0 additions & 404 deletions js/react_native/e2e/ios/main.jsbundle
jchen351 marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

4 changes: 2 additions & 2 deletions js/react_native/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"react": "^18.1.0",
"react-native": "^0.69.1",
"react-native": "^0.70.15",
"react-native-fs": "^2.20.0"
},
"devDependencies": {
Expand All @@ -19,6 +19,6 @@
"babel-plugin-module-resolver": "^4.0.0",
"detox": "^20.7.0",
"jest": "^29",
"metro-react-native-babel-preset": "^0.67.0"
"metro-react-native-babel-preset": "0.72.4"
}
}
2 changes: 1 addition & 1 deletion js/react_native/e2e/test/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module.exports = {
rootDir: '..',
testMatch: ['<rootDir>/test/**/*.test.js'],
testTimeout: 120000,
testTimeout: 240000,
maxWorkers: 1,
globalSetup: 'detox/runners/jest/globalSetup',
globalTeardown: 'detox/runners/jest/globalTeardown',
Expand Down
Loading
Loading