development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for outdated Podfile before running pod install (#79343)

Browse source
This commit is contained in:
Jenn Magder 2021-03-30 12:42:39 -07:00 committed by GitHub
parent f59b185be4
commit 5a6d2a0a8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/flutter_tools/lib/src/macos/cocoapods.dart
View file

@ -162,6 +162,7 @@ class CocoaPods {
if (!xcodeProject.podfile.existsSync()) {
throwToolExit('Podfile missing');
}
_warnIfPodfileOutOfDate(xcodeProject);
bool podsProcessed = false;
if (_shouldRunPodInstall(xcodeProject, dependenciesChanged)) {
if (!await _checkPodCondition()) {
@ -170,7 +171,6 @@ class CocoaPods {
await _runPodInstall(xcodeProject, buildMode);
podsProcessed = true;
}
_warnIfPodfileOutOfDate(xcodeProject);
return podsProcessed;
}

22
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file

@ -20,6 +20,7 @@ import 'package:test/fake.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fake_process_manager.dart';
typedef InvokeProcess = Future<ProcessResult> Function();
@ -322,6 +323,7 @@ void main() {
buildMode: BuildMode.debug,
), throwsToolExit(message: 'CocoaPods not installed or not in valid state'));
expect(fakeProcessManager.hasRemainingExpectations, isFalse);
expect(fakeProcessManager, hasNoRemainingExpectations);
});
testWithoutContext('throwsToolExit if CocoaPods install is broken', () async {
@ -332,17 +334,10 @@ void main() {
buildMode: BuildMode.debug,
), throwsToolExit(message: 'CocoaPods not installed or not in valid state'));
expect(fakeProcessManager.hasRemainingExpectations, isFalse);
expect(fakeProcessManager, hasNoRemainingExpectations);
});
testWithoutContext('exits if Podfile creates the Flutter engine symlink', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
fakeProcessManager.addCommand(
const FakeCommand(
command: <String>['pod', 'install', '--verbose'],
),
);
fileSystem.file(fileSystem.path.join('project', 'ios', 'Podfile'))
..createSync()
..writeAsStringSync('Existing Podfile');
@ -355,17 +350,10 @@ void main() {
xcodeProject: projectUnderTest.ios,
buildMode: BuildMode.debug,
), throwsToolExit(message: 'Podfile is out of date'));
expect(fakeProcessManager, hasNoRemainingExpectations);
});
testWithoutContext('exits if iOS Podfile parses .flutter-plugins', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
fakeProcessManager.addCommand(
const FakeCommand(
command: <String>['pod', 'install', '--verbose'],
),
);
fileSystem.file(fileSystem.path.join('project', 'ios', 'Podfile'))
..createSync()
..writeAsStringSync('plugin_pods = parse_KV_file(\'../.flutter-plugins\')');
@ -374,6 +362,7 @@ void main() {
xcodeProject: projectUnderTest.ios,
buildMode: BuildMode.debug,
), throwsToolExit(message: 'Podfile is out of date'));
expect(fakeProcessManager, hasNoRemainingExpectations);
});
testWithoutContext('prints warning if macOS Podfile parses .flutter-plugins', () async {
@ -396,6 +385,7 @@ void main() {
expect(logger.errorText, contains('Warning: Podfile is out of date'));
expect(logger.errorText, contains('rm macos/Podfile'));
expect(fakeProcessManager, hasNoRemainingExpectations);
});
testWithoutContext('throws, if Podfile is missing.', () async {