firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove outdated arm64_armv7 check (#142737)

Browse Source 
CI is running Xcode 15, remove outdated arm64_armv7 framework checks.
This commit is contained in:
Jenn Magder 2024-02-01 11:27:56 -08:00 committed by GitHub
parent cd6ed39550
commit 89d46db775
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
View File

@ -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
'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');
} }