Skip to content

Commit 025c8c1

Browse files
authored
Adopt Xcode 12 for podspec lints (flutter#3653)
1 parent 60d85fd commit 025c8c1

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

.cirrus.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -202,26 +202,6 @@ task:
202202
# This UI change sometimes affects `xctest`.
203203
# So we run `drive-examples` after `xctest`, changing the order will result ci failure.
204204
- ./script/incremental_build.sh drive-examples --ios
205-
206-
task:
207-
# Xcode 11 task
208-
# TODO(cyanglaz): merge Xcode 11 task to Xcode 12 task when all the matrix can be run in Xcode 12.
209-
# don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
210-
only_if: $CIRRUS_TAG == ''
211-
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
212-
osx_instance:
213-
image: catalina-xcode-11.3.1-flutter
214-
upgrade_script:
215-
- sudo gem install cocoapods
216-
- flutter channel stable
217-
- flutter upgrade
218-
- flutter channel master
219-
- flutter upgrade
220-
- git fetch origin master
221-
create_simulator_script:
222-
- xcrun simctl list
223-
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
224-
matrix:
225205
- name: lint_darwin_plugins
226206
env:
227207
matrix:

script/tool/lib/src/lint_podspecs_command.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class LintPodspecsCommand extends PluginCommand {
122122
'lib',
123123
'lint',
124124
podspecPath,
125+
'--configuration=Debug', // Release targets unsupported arm64 simulators. Use Debug to only build against targeted x86_64 simulator devices.
125126
if (allowWarnings) '--allow-warnings',
126127
if (libraryLint) '--use-libraries'
127128
];

script/tool/test/lint_podspecs_command_test.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ void main() {
8181
'lib',
8282
'lint',
8383
p.join(plugin1Dir.path, 'ios', 'plugin1.podspec'),
84+
'--configuration=Debug',
8485
'--use-libraries'
8586
],
8687
mockPackagesDir.path),
@@ -90,6 +91,7 @@ void main() {
9091
'lib',
9192
'lint',
9293
p.join(plugin1Dir.path, 'ios', 'plugin1.podspec'),
94+
'--configuration=Debug',
9395
],
9496
mockPackagesDir.path),
9597
]),
@@ -138,6 +140,7 @@ void main() {
138140
'lib',
139141
'lint',
140142
p.join(plugin1Dir.path, 'plugin1.podspec'),
143+
'--configuration=Debug',
141144
'--allow-warnings',
142145
'--use-libraries'
143146
],
@@ -148,6 +151,7 @@ void main() {
148151
'lib',
149152
'lint',
150153
p.join(plugin1Dir.path, 'plugin1.podspec'),
154+
'--configuration=Debug',
151155
'--allow-warnings',
152156
],
153157
mockPackagesDir.path),

0 commit comments

Comments
 (0)