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

Update error message for Cocoapods support for synchronized groups/folders (#158206)

Browse Source 
Update to https://github.com/flutter/flutter/issues/156733
This commit is contained in:
LouiseHsu 2024-11-05 17:08:54 -08:00 committed by GitHub
parent 2f7a1aa20b
commit dff191625f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/flutter_tools/lib/src/macos/cocoapods.dart
View File

@ -75,7 +75,7 @@ enum CocoaPodsStatus {
}
const Version cocoaPodsMinimumVersion = Version.withText(1, 10, 0, '1.10.0');
const Version cocoaPodsRecommendedVersion = Version.withText(1, 13, 0, '1.13.0');
const Version cocoaPodsRecommendedVersion = Version.withText(1, 16, 2, '1.16.2');
/// Cocoapods is a dependency management solution for iOS and macOS applications.
///
@ -503,14 +503,11 @@ class CocoaPods {
}
}
} else if (stdout.contains('unknown ISA `PBXFileSystemSynchronizedRootGroup`')) {
// CocoaPods does not work with Xcode 16 since it has not yet been
// updated to handled synchronized
// CocoaPods must be at least verison 1.16.2 to handle synchronized
// groups/folders https://github.com/CocoaPods/CocoaPods/issues/12456
_logger.printError(
'Error: CocoaPods does not support Xcode 16 synchronized groups. '
'To fix your Xcode project, '
'see https://github.com/flutter/flutter/issues/156733#issuecomment-2415359014 '
'for a workaround.',
'Error: Your Cocoapods might be out-of-date and unable to support synchronized groups/folders. '
'Please update to a minimum version of 1.16.2 and try again.',
emphasis: true,
);
}

10
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View File

@ -175,13 +175,13 @@ void main() {
testWithoutContext('detects at recommended version', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.13.0');
pretendPodVersionIs('1.16.2');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended);
});
testWithoutContext('detects above recommended version', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.13.1');
pretendPodVersionIs('1.16.3');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended);
});
});
@ -557,10 +557,8 @@ If this ISA was generated by Xcode please file an issue: https://github.com/Coco
expect(
logger.errorText,
contains(
'Error: CocoaPods does not support Xcode 16 synchronized groups. '
'To fix your Xcode project, '
'see https://github.com/flutter/flutter/issues/156733#issuecomment-2415359014 '
'for a workaround.',
'Error: Your Cocoapods might be out-of-date and unable to support synchronized groups/folders. '
'Please update to a minimum version of 1.16.2 and try again.',
),
);
});

2
packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
View File

@ -54,7 +54,7 @@ void main() {
final ValidationMessage message = result.messages.first;
expect(message.type, ValidationMessageType.hint);
expect(message.message, contains('CocoaPods $currentVersion out of date'));
expect(message.message, contains('(1.13.0 is recommended)'));
expect(message.message, contains('(1.16.2 is recommended)'));
expect(message.message, contains('getting-started.html#updating-cocoapods'));
});
});