diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile index bec13598229cd..4bf19f965c553 100644 --- a/js/react_native/e2e/ios/Podfile +++ b/js/react_native/e2e/ios/Podfile @@ -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! diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index b5bd197d1ebd9..e3887e327b7af 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -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! diff --git a/js/react_native/onnxruntime-react-native.podspec b/js/react_native/onnxruntime-react-native.podspec index 914a396be1f1d..50eba7dfaa1e0 100644 --- a/js/react_native/onnxruntime-react-native.podspec +++ b/js/react_native/onnxruntime-react-native.podspec @@ -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}" diff --git a/tools/ci_build/github/apple/build_apple_framework.py b/tools/ci_build/github/apple/build_apple_framework.py index e17bcd65d8814..3cd7a3af70622 100644 --- a/tools/ci_build/github/apple/build_apple_framework.py +++ b/tools/ci_build/github/apple/build_apple_framework.py @@ -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. """, diff --git a/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json b/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json index 04a73ae450e5f..84d7e355ed5b4 100644 --- a/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json +++ b/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json @@ -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" ] } } diff --git a/tools/ci_build/github/apple/default_full_ios_framework_build_settings.json b/tools/ci_build/github/apple/default_full_ios_framework_build_settings.json index 4bc978956d7fc..e2d8f70c02cf3 100644 --- a/tools/ci_build/github/apple/default_full_ios_framework_build_settings.json +++ b/tools/ci_build/github/apple/default_full_ios_framework_build_settings.json @@ -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", diff --git a/tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json b/tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json deleted file mode 100644 index 2bdf8de24f53c..0000000000000 --- a/tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "build_osx_archs": { - "iphoneos": [ - "arm64" - ], - "iphonesimulator": [ - "arm64", - "x86_64" - ] - }, - "build_params": { - "base": [ - "--parallel", - "--use_xcode", - "--build_apple_framework", - "--minimal_build=extended", - "--disable_rtti", - "--disable_ml_ops", - "--disable_exceptions", - "--enable_reduced_operator_type_support", - "--use_coreml", - "--skip_tests", - "--cmake_extra_defines=onnxruntime_BUILD_UNIT_TESTS=OFF" - ], - "iphoneos": [ - "--ios", - "--apple_deploy_target=12.0" - ], - "iphonesimulator": [ - "--ios", - "--apple_deploy_target=12.0" - ] - } -} diff --git a/tools/ci_build/github/apple/default_training_ios_framework_build_settings.json b/tools/ci_build/github/apple/default_training_ios_framework_build_settings.json index 2066af7843e0a..1d4a8c038c07b 100644 --- a/tools/ci_build/github/apple/default_training_ios_framework_build_settings.json +++ b/tools/ci_build/github/apple/default_training_ios_framework_build_settings.json @@ -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", diff --git a/tools/ci_build/github/apple/test_minimal_training_ios_simulator_framework_build_settings.json b/tools/ci_build/github/apple/test_minimal_training_ios_simulator_framework_build_settings.json index 1a89d941e5e52..8f283173f1c6a 100644 --- a/tools/ci_build/github/apple/test_minimal_training_ios_simulator_framework_build_settings.json +++ b/tools/ci_build/github/apple/test_minimal_training_ios_simulator_framework_build_settings.json @@ -16,7 +16,7 @@ ], "iphonesimulator": [ "--ios", - "--apple_deploy_target=12.0" + "--apple_deploy_target=13.0" ] } } diff --git a/tools/ci_build/github/apple/use_ios_pods_with_custom_build.md b/tools/ci_build/github/apple/use_ios_pods_with_custom_build.md index c8da2eff57c33..9e5215a2dc25a 100644 --- a/tools/ci_build/github/apple/use_ios_pods_with_custom_build.md +++ b/tools/ci_build/github/apple/use_ios_pods_with_custom_build.md @@ -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`. diff --git a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml index 255531681b039..0a19312790a98 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml @@ -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 \ diff --git a/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml index 881023e1c1186..c209e20adc131 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml @@ -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 diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index 38dc53cb5daf2..6901dcb7b68df 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -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 diff --git a/tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml b/tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml index 2c9f968380a38..a1ae63e606526 100644 --- a/tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml @@ -2,7 +2,6 @@ parameters: - name: packageVariant type: string values: - - Mobile - Full - Training @@ -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 diff --git a/tools/ci_build/github/js/react_native_e2e_full_ios_framework_build_settings.json b/tools/ci_build/github/js/react_native_e2e_full_ios_framework_build_settings.json index 78de7edb5ec29..a1266a80d1cd9 100644 --- a/tools/ci_build/github/js/react_native_e2e_full_ios_framework_build_settings.json +++ b/tools/ci_build/github/js/react_native_e2e_full_ios_framework_build_settings.json @@ -14,7 +14,7 @@ ], "iphonesimulator": [ "--ios", - "--apple_deploy_target=12.0" + "--apple_deploy_target=13.0" ] } } diff --git a/tools/ci_build/github/js/react_native_e2e_mobile_ios_framework_build_settings.json b/tools/ci_build/github/js/react_native_e2e_mobile_ios_framework_build_settings.json index 3d80231393cc6..73ff98f921482 100644 --- a/tools/ci_build/github/js/react_native_e2e_mobile_ios_framework_build_settings.json +++ b/tools/ci_build/github/js/react_native_e2e_mobile_ios_framework_build_settings.json @@ -19,7 +19,7 @@ ], "iphonesimulator": [ "--ios", - "--apple_deploy_target=12.0" + "--apple_deploy_target=13.0" ] } }