Skip to content
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
8 changes: 4 additions & 4 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "xcode", "version": "14c18"},
{"dependency": "xcode", "version": "14e222b"},
{"dependency": "gems", "version": "v3.3.14"}
]
os: Mac-12
device_type: none
cpu: arm64
xcode: 14c18
xcode: 14e222b
mac_x64:
properties:
dependencies: >-
[
{"dependency": "xcode", "version": "14c18"},
{"dependency": "xcode", "version": "14e222b"},
{"dependency": "gems", "version": "v3.3.14"}
]
os: Mac-12
device_type: none
cpu: x86
xcode: 14c18
xcode: 14e222b

targets:
### iOS+macOS tasks ***
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/create_simulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# 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-2
readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-4

xcrun simctl list
xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS" | xargs xcrun simctl boot
3 changes: 3 additions & 0 deletions script/tool/lib/src/podspec_check_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ class PodspecCheckCommand extends PackageLoopingCommand {
podspecPath,
'--configuration=Debug', // Release targets unsupported arm64 simulators. Use Debug to only build against targeted x86_64 simulator devices.
'--skip-tests',
// TODO(vashworth): remove allow-warnings when https://github.com/flutter/flutter/issues/125812 is fixed.
// https://github.com/flutter/flutter/issues/125812
'--allow-warnings',
'--use-modular-headers', // Flutter sets use_modular_headers! in its templates.
if (libraryLint) '--use-libraries'
];
Expand Down
2 changes: 2 additions & 0 deletions script/tool/test/podspec_check_command_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ void main() {
.path,
'--configuration=Debug',
'--skip-tests',
'--allow-warnings',
'--use-modular-headers',
'--use-libraries'
],
Expand All @@ -158,6 +159,7 @@ void main() {
.path,
'--configuration=Debug',
'--skip-tests',
'--allow-warnings',
'--use-modular-headers',
],
packagesDir.path),
Expand Down