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.

Sign up for GitHub

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

Update react-native to 0.7x #21122

Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open

Update react-native to 0.7x #21122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
acf9f65
Update pool to MacOS-13
jchen351 Aug 30, 2023
1af95ce
Merge branch 'main' into Cjian/macos13
jchen351 Nov 17, 2023
32d19a8
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 May 15, 2024
a6a85d7
update react-native and npm audit fix
jchen351 Jun 20, 2024
55a21b0
Merge remote-tracking branch 'origin/main' into Cjian/macos13
jchen351 Jun 21, 2024
912c9a5
update jave sdk from 11 to 17
jchen351 Jun 24, 2024
f820cf5
Use Xcode version 14.3 instead of
jchen351 Jun 24, 2024
3d3389e
14.3.1
jchen351 Jun 24, 2024
93ec7e2
macOS-13
jchen351 Jun 24, 2024
ee9dfc4
macOS-13
jchen351 Jun 24, 2024
53a03b1
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 Jun 26, 2024
f0ca208
update ios target to 15
jchen351 Jun 28, 2024
ffb6f5c
Merge remote-tracking branch 'origin/main' into Cjian/macos13
snnn Jun 29, 2024
c85fdd7
Merge branch 'refs/heads/main' into Cjian/macos13
jchen351 Jul 17, 2024
da23b72
Installing gcovr from apt-get
jchen351 Jul 17, 2024
462782e
Merge branch 'refs/heads/Cjian/macos13' into Cjian/cg
jchen351 Jul 17, 2024
b43bc45
js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj
jchen351 Jul 19, 2024
6184cd5
remove post_install
jchen351 Jul 19, 2024
fa5cf75
Podfile
jchen351 Jul 19, 2024
37bbfd0
../node_modules/react-native/
jchen351 Jul 19, 2024
68e0075
use_react_native
jchen351 Jul 19, 2024
b74cf35
js/react_native/ios/Podfile
jchen351 Jul 22, 2024
cb92bd5
js/react_native/ios/Podfile
jchen351 Jul 22, 2024
ecfa1bf
js/react_native/ios/Podfile
jchen351 Jul 22, 2024
58b7b5f
--enable_lto \
jchen351 Jul 22, 2024
90818b0
platform :ios, '15.0'
jchen351 Jul 23, 2024
776d071
Merge branch 'refs/heads/main' into Cjian/cg
jchen351 Jul 24, 2024
e7e574f
react-native": "
jchen351 Jul 24, 2024
aff66bb
react-native-community/cli
jchen351 Jul 24, 2024
c22daf3
Podfile
jchen351 Jul 26, 2024
c8266af
use_react_native!(:path => '../node_modules/react-native')
jchen351 Jul 27, 2024
a153abd
platform :ios, '15.0'
jchen351 Jul 29, 2024
ab4c79f
"@react-native-community/cli": "^13.6.5",
jchen351 Jul 29, 2024
e75be4e
yarn
jchen351 Jul 29, 2024
b5990e1
downgade the react to 0.72
jchen351 Jul 30, 2024
0246310
remove react.gradle
jchen351 Jul 30, 2024
c345fcb
220
jchen351 Jul 30, 2024
0debec3
Check if emulator is running
jchen351 Jul 31, 2024
dcca550
Check if emulator is running
jchen351 Jul 31, 2024
2459208
react-native
jchen351 Jul 31, 2024
aba2284
Build React Native Detox Android e2e Tests
jchen351 Jul 31, 2024
383ed7f
Do not allow clearing Android logs if the emulator is not running
jchen351 Jul 31, 2024
ab78e66
implementation 'com.facebook.react:react-native:+'
jchen351 Jul 31, 2024
cce7cca
if is_emulator_running(sdk_tool_paths.adb):
jchen351 Jul 31, 2024
22da19c
result = run(f'{adb_path} devices', capture_stdout=True)
jchen351 Jul 31, 2024
283ca73
sdk_tool_paths
jchen351 Jul 31, 2024
1f58393
sdk_tool_paths
jchen351 Jul 31, 2024
bfe7869
lines = output.strip().split("\n")
jchen351 Jul 31, 2024
033442c
lines = output.strip().split("\n")
jchen351 Jul 31, 2024
10ae66c
lines = output.strip().split("\n")
jchen351 Jul 31, 2024
5f08d97
lines = output.strip().split("\n")
jchen351 Jul 31, 2024
49f3be9
lines = output.strip().split("\n")
jchen351 Jul 31, 2024
b9d7e34
splitlines
jchen351 Aug 1, 2024
eef0213
splitlines
jchen351 Aug 1, 2024
c9a006e
Merge branch 'refs/heads/Cjian/emu' into Cjian/cg
jchen351 Aug 1, 2024
ab20327
Merge branch 'refs/heads/main' into Cjian/cg
jchen351 Aug 19, 2024
e57c638
Reverting pipeline changes
jchen351 Aug 26, 2024
e1aae89
Merge branch 'refs/heads/main' into Cjian/cg
jchen351 Aug 26, 2024
2ff5454
Checkout java/build-android.gradle
jchen351 Aug 27, 2024
0ee4354
using fb 0.72.15
jchen351 Aug 28, 2024
d948315
Merge branch 'refs/heads/main' into Cjian/cg
jchen351 Sep 17, 2024
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
3 changes: 1 addition & 2 deletions js/react_native/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,13 @@ repositories {
}

dependencies {
api "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
api "org.mockito:mockito-core:2.28.2"

androidTestImplementation "androidx.test:runner:1.1.0"
androidTestImplementation "androidx.test:rules:1.1.0"

implementation "junit:junit:4.12"

implementation 'com.facebook.react:react-native:0.72.15'
androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito-inline-extended:2.28.1"

implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar"
Expand Down
2 changes: 1 addition & 1 deletion js/react_native/e2e/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ project.ext.react = [
entryFile: "index.tsx",
]

apply from: "../../node_modules/react-native/react.gradle"
// apply from: "../../node_modules/react-native/react.gradle"

/**
* Set this to true to create two separate APKs instead of one:
Expand Down
8 changes: 6 additions & 2 deletions js/react_native/e2e/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

platform :ios, '13.0'
platform :ios, '15.0'

pre_install do |installer|
# Custom pre-install script or commands
Expand All @@ -15,7 +15,11 @@ end
target 'OnnxruntimeModuleExample' do
config = use_native_modules!

use_react_native!(:path => config["reactNativePath"])
if config["reactNativePath"] != nil
use_react_native!(:path => config["reactNativePath"])
else
use_react_native!(:path => '../node_modules/react-native')
end

use_frameworks!

Expand Down
2 changes: 1 addition & 1 deletion js/react_native/e2e/package.json
View file
Open in desktop
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.72.15",
"react-native-fs": "^2.20.0"
},
"devDependencies": {
Expand Down
4,582 changes: 1,701 additions & 2,881 deletions js/react_native/e2e/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions js/react_native/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

platform :ios, '13.0'
platform :ios, '15.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specs satisfying the RCTRequired (from ../node_modules/react-native//Libraries/Required) dependency were found, but they required a higher minimum deployment target.
https://dev.azure.com/onnxruntime/onnxruntime/_build/results?buildId=1439006&view=logs&j=de302ec2-2305-57e0-e8c6-cd89c569f2a3&t=65d5dc62-c4eb-539e-a5bd-5c7416a33c7a&l=63


pre_install do |installer|
# Custom pre-install script or commands
Expand All @@ -13,9 +13,8 @@ pre_install do |installer|
end

def shared
config = use_native_modules!

use_react_native!(:path => config["reactNativePath"])
use_react_native!(:path => '../node_modules/react-native')

# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
Expand Down
4 changes: 2 additions & 2 deletions js/react_native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"devDependencies": {
"@types/jest": "^27.4.0",
"@types/react": "^18.0.9",
"@types/react-native": "^0.67.7",
"@types/react-native": "*",
"jest": "^27.4.7",
"pod-install": "^0.1.36",
"prettier": "^2.6.2",
"react": "^18.1.0",
"react-native": "^0.69.7",
"react-native": "0.72.15",
"react-native-builder-bob": "^0.18.2"
},
"peerDependencies": {
Expand Down
5,222 changes: 2,675 additions & 2,547 deletions js/react_native/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

Loading