Skip to content

Update tests to Xcode 15 and iOS 17 simulator #5914

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

Merged
merged 3 commits into from
Jan 18, 2024
Merged

Update tests to Xcode 15 and iOS 17 simulator #5914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
582f07d
Update tests to Xcode 15 and iOS 17 simulator
vashworth Jan 17, 2024
9ff2a2a
Merge branch 'main' into update_to_xcode_15
vashworth Jan 17, 2024
e511380
Merge branch 'main' into update_to_xcode_15
vashworth Jan 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
8 changes: 4 additions & 4 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,25 @@ platform_properties:
[
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
]
os: Mac-12|Mac-13
os: Mac-13
device_type: none
cpu: arm64
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
"sdk_version": "15a240d"
}
mac_x64:
properties:
dependencies: >-
[
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
]
os: Mac-12|Mac-13
os: Mac-13
device_type: none
cpu: x86
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
"sdk_version": "15a240d"
}

targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/create_simulator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -o pipefail
# The name here must match remove_simulator.sh
readonly DEVICE_NAME=Flutter-iPhone
readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14
readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-4
readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-17-0

# Delete any existing devices named Flutter-iPhone. Having more than one may
# cause issues when builds target the device.
Expand Down
4 changes: 2 additions & 2 deletions .ci/targets/ios_platform_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ tasks:
args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
- name: native test
script: script/tool_runner.sh
# Simulator name must match name in create_simulator.sh
args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=16.4"]
# Simulator name and version must match name and version in create_simulator.sh
args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=17.0"]
- name: boot simulator
# Ensure simulator is still booted
script: .ci/scripts/boot_simulator.sh
Expand Down
4 changes: 2 additions & 2 deletions packages/pigeon/tool/shared/test_suites.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ Future<int> _runIOSPluginUnitTests(String testPluginPath) async {

const String deviceName = 'Pigeon-Test-iPhone';
const String deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14';
const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-16-4';
const String deviceOS = '16.4';
const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-17-0';
const String deviceOS = '17.0';
await _createSimulator(deviceName, deviceType, deviceRuntime);
return runXcodeBuild(
'$examplePath/ios',
Expand Down