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

Avoid duplicating Pods-Runner xcconfig #includes (#75822)

Browse Source
This commit is contained in:
Jenn Magder 2021-02-11 14:11:15 -08:00 committed by GitHub
parent cc95c972b7
commit ba5e237e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,9 +274,10 @@ class CocoaPods {
final File file = xcodeProject.xcodeConfigFor(mode); final File file = xcodeProject.xcodeConfigFor(mode);
if (file.existsSync()) { if (file.existsSync()) {
final String content = file.readAsStringSync(); final String content = file.readAsStringSync();
final String include = '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.${mode final String includeFile = 'Pods/Target Support Files/Pods-Runner/Pods-Runner.${mode
.toLowerCase()}.xcconfig"'; .toLowerCase()}.xcconfig';
if (!content.contains(include)) { final String include = '#include? "$includeFile"';
if (!content.contains(includeFile)) {
file.writeAsStringSync('$include\n$content', flush: true); file.writeAsStringSync('$include\n$content', flush: true);
} }
} }

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

@ -260,6 +260,34 @@ void main() {
FileSystem: () => fileSystem, FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
}); });
testUsingContext('does not include Pod config in xcconfig files, if legacy non-option include present', () async {
projectUnderTest.ios.podfile..createSync()..writeAsStringSync('Existing Podfile');
const String legacyDebugInclude = '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig';
projectUnderTest.ios.xcodeConfigFor('Debug')
..createSync(recursive: true)
..writeAsStringSync(legacyDebugInclude);
const String legacyReleaseInclude = '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig';
projectUnderTest.ios.xcodeConfigFor('Release')
..createSync(recursive: true)
..writeAsStringSync(legacyReleaseInclude);
final FlutterProject project = FlutterProject.fromPath('project');
await cocoaPodsUnderTest.setupPodfile(project.ios);
final String debugContents = projectUnderTest.ios.xcodeConfigFor('Debug').readAsStringSync();
// Redundant contains check, but this documents what we're testing--that the optional
// #include? doesn't get written in addition to the previous style #include.
expect(debugContents, isNot(contains('#include?')));
expect(debugContents, equals(legacyDebugInclude));
final String releaseContents = projectUnderTest.ios.xcodeConfigFor('Release').readAsStringSync();
expect(releaseContents, isNot(contains('#include?')));
expect(releaseContents, equals(legacyReleaseInclude));
}, overrides: <Type, Generator>{
FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(),
});
}); });
group('Update xcconfig', () { group('Update xcconfig', () {