Skip to content

Commit 89d46db

Browse files
authored
Remove outdated arm64_armv7 check (#142737)
CI is running Xcode 15, remove outdated arm64_armv7 framework checks.
1 parent cd6ed39 commit 89d46db

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

dev/devicelab/bin/tasks/build_ios_framework_module_test.dart

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
278278
throw TaskResult.failure('$pluginFrameworkPath does not link on Flutter');
279279
}
280280

281-
// TODO(jmagman): Remove ios-arm64_armv7 checks when CI is updated to Xcode 14.
282281
final String transitiveDependencyFrameworkPath = path.join(
283282
outputPath,
284283
mode,
@@ -288,23 +287,11 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
288287
'Reachability',
289288
);
290289

291-
final String armv7TransitiveDependencyFrameworkPath = path.join(
292-
outputPath,
293-
mode,
294-
'Reachability.xcframework',
295-
'ios-arm64_armv7',
296-
'Reachability.framework',
297-
'Reachability',
298-
);
299-
300-
final bool transitiveDependencyExists = exists(File(transitiveDependencyFrameworkPath));
301-
final bool armv7TransitiveDependencyExists = exists(File(armv7TransitiveDependencyFrameworkPath));
302-
if (!transitiveDependencyExists && !armv7TransitiveDependencyExists) {
290+
if (!exists(File(transitiveDependencyFrameworkPath))) {
303291
throw TaskResult.failure('Expected debug Flutter engine artifact binary to exist');
304292
}
305293

306-
if ((transitiveDependencyExists && await _linksOnFlutter(transitiveDependencyFrameworkPath)) ||
307-
(armv7TransitiveDependencyExists && await _linksOnFlutter(armv7TransitiveDependencyFrameworkPath))) {
294+
if (await _linksOnFlutter(transitiveDependencyFrameworkPath)) {
308295
throw TaskResult.failure(
309296
'Transitive dependency $transitiveDependencyFrameworkPath unexpectedly links on Flutter');
310297
}

0 commit comments

Comments
 (0)