Unverified Commit 89d46db7 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Remove outdated arm64_armv7 check (#142737)

CI is running Xcode 15, remove outdated arm64_armv7 framework checks.
parent cd6ed395
...@@ -278,7 +278,6 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals ...@@ -278,7 +278,6 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
throw TaskResult.failure('$pluginFrameworkPath does not link on Flutter'); 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( final String transitiveDependencyFrameworkPath = path.join(
outputPath, outputPath,
mode, mode,
...@@ -288,23 +287,11 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals ...@@ -288,23 +287,11 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'Reachability', 'Reachability',
); );
final String armv7TransitiveDependencyFrameworkPath = path.join( if (!exists(File(transitiveDependencyFrameworkPath))) {
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) {
throw TaskResult.failure('Expected debug Flutter engine artifact binary to exist'); throw TaskResult.failure('Expected debug Flutter engine artifact binary to exist');
} }
if ((transitiveDependencyExists && await _linksOnFlutter(transitiveDependencyFrameworkPath)) || if (await _linksOnFlutter(transitiveDependencyFrameworkPath)) {
(armv7TransitiveDependencyExists && await _linksOnFlutter(armv7TransitiveDependencyFrameworkPath))) {
throw TaskResult.failure( throw TaskResult.failure(
'Transitive dependency $transitiveDependencyFrameworkPath unexpectedly links on Flutter'); 'Transitive dependency $transitiveDependencyFrameworkPath unexpectedly links on Flutter');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment