From 89d46db77501abc95fbdbf091e7a3f6c4cd31ae9 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 1 Feb 2024 11:27:56 -0800 Subject: [PATCH] Remove outdated arm64_armv7 check (#142737) CI is running Xcode 15, remove outdated arm64_armv7 framework checks. --- .../tasks/build_ios_framework_module_test.dart | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart b/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart index eb433c46fb..ca5fbe6c41 100644 --- a/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart +++ b/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart @@ -278,7 +278,6 @@ Future _testBuildIosFramework(Directory projectDir, { bool isModule = fals throw TaskResult.failure('$pluginFrameworkPath does not link on Flutter'); } - // TODO(jmagman): Remove ios-arm64_armv7 checks when CI is updated to Xcode 14. final String transitiveDependencyFrameworkPath = path.join( outputPath, mode, @@ -288,23 +287,11 @@ Future _testBuildIosFramework(Directory projectDir, { bool isModule = fals 'Reachability', ); - final String armv7TransitiveDependencyFrameworkPath = path.join( - outputPath, - mode, - 'Reachability.xcframework', - 'ios-arm64_armv7', - 'Reachability.framework', - 'Reachability', - ); - - final bool transitiveDependencyExists = exists(File(transitiveDependencyFrameworkPath)); - final bool armv7TransitiveDependencyExists = exists(File(armv7TransitiveDependencyFrameworkPath)); - if (!transitiveDependencyExists && !armv7TransitiveDependencyExists) { + if (!exists(File(transitiveDependencyFrameworkPath))) { throw TaskResult.failure('Expected debug Flutter engine artifact binary to exist'); } - if ((transitiveDependencyExists && await _linksOnFlutter(transitiveDependencyFrameworkPath)) || - (armv7TransitiveDependencyExists && await _linksOnFlutter(armv7TransitiveDependencyFrameworkPath))) { + if (await _linksOnFlutter(transitiveDependencyFrameworkPath)) { throw TaskResult.failure( 'Transitive dependency $transitiveDependencyFrameworkPath unexpectedly links on Flutter'); }