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

Upgrade min ios version to 13.0 #20773

Merged
merged 4 commits into from
Jun 4, 2024
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/ios/Podfile
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, '12.4'
platform :ios, '13.0'

target 'OnnxruntimeModuleExample' do
config = use_native_modules!
Expand Down
2 changes: 1 addition & 1 deletion js/react_native/ios/Podfile
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, '12.4'
platform :ios, '13.0'

def shared
config = use_native_modules!
Expand Down
2 changes: 1 addition & 1 deletion js/react_native/onnxruntime-react-native.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pod::Spec.new do |spec|
spec.license = package["license"]
spec.authors = package["author"]

spec.platforms = { :ios => "12.4" }
spec.platforms = { :ios => "13.0" }
spec.source = { :git => "https://github.com/Microsoft/onnxruntime.git", :tag => "rel-#{spec.version}" }

spec.source_files = "ios/*.{h,mm}"
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/apple/build_apple_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def parse_args():
os.path.basename(__file__),
description="""Create iOS framework and podspec for one or more osx_archs (xcframework)
and building properties specified in the given build config file, see
tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json for details.
tools/ci_build/github/apple/default_full_apple_framework_build_settings.json for details.
The output of the final xcframework and podspec can be found under [build_dir]/framework_out.
Please note, this building script will only work on macOS.
""",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
],
"iphoneos": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
],
"iphonesimulator": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
"--ios",
"--use_xcode",
"--use_xnnpack",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
],
"iphonesimulator": [
"--ios",
"--use_xcode",
"--use_xnnpack",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
],
"macabi":[
"--macos=Catalyst",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
],
"iphoneos": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
],
"iphonesimulator": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
],
"macosx": [
"--macos=MacOSX",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"iphonesimulator": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Run the script:
python3 tools/ci_build/github/apple/build_and_assemble_apple_pods.py \
--staging-dir /path/to/staging/dir \
--include-ops-by-config /path/to/custom.config \
--build-settings-file tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json
--build-settings-file tools/ci_build/github/apple/default_full_apple_framework_build_settings.json
```

This will do a custom build and create the pod package files for it in `/path/to/staging/dir`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
--ios \
--apple_sysroot iphonesimulator \
--osx_arch x86_64 \
--apple_deploy_target 12.0 \
--apple_deploy_target=13.0 \
--use_xcode \
--config RelWithDebInfo \
--build_apple_framework \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ stages:
displayName: "Set common variables"
name: SetCommonVariables

- template: templates/stages/mac-ios-packaging-build-stage.yml
parameters:
packageVariant: Mobile

- template: templates/stages/mac-ios-packaging-build-stage.yml
parameters:
packageVariant: Full
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -445,14 +445,14 @@ stages:
python tools/ci_build/github/apple/build_apple_framework.py \
--build_dir "$(Build.BinariesDirectory)/ios_framework" \
--build_dynamic_framework \
tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json
tools/ci_build/github/apple/default_full_apple_framework_build_settings.json
displayName: "Build iOS dynamic framework"

- script: |
python tools/ci_build/github/apple/test_apple_packages.py \
--framework_info_file "$(Build.BinariesDirectory)/ios_framework/xcframework_info.json" \
--c_framework_dir "$(Build.BinariesDirectory)/ios_framework/framework_out" \
--variant Mobile
--variant Full
displayName: "Test pod with iOS framework"

- stage: IosMinimalTrainingBuild
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ parameters:
- name: packageVariant
type: string
values:
- Mobile
- Full
- Training

Expand All @@ -22,12 +21,6 @@ stages:
xcodeVersion: "14.2"
ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']]

${{ if eq(parameters.packageVariant, 'Mobile') }}:
buildSettingsFile: "tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json"
optionalIncludeOpsByConfigOption: "--include-ops-by-config tools/ci_build/github/android/mobile_package.required_operators.config"
cPodName: onnxruntime-mobile-c
objcPodName: onnxruntime-mobile-objc

${{ if eq(parameters.packageVariant, 'Full') }}:
buildSettingsFile: "tools/ci_build/github/apple/default_full_apple_framework_build_settings.json"
cPodName: onnxruntime-c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"iphonesimulator": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"iphonesimulator": [
"--ios",
"--apple_deploy_target=12.0"
"--apple_deploy_target=13.0"
]
}
}
Loading