firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the LANG when invoking cocoapods (#45710)

Browse Source
This commit is contained in:
Dan Field
2019-12-02 13:26:32 -08:00
committed by GitHub
parent afb8f38211
commit 088fa24463
7 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev/bots/test.dart
View File

@@ -333,6 +333,9 @@ Future<void> _flutterBuildIpa(String relativePathToApplication) async {
await runCommand('pod',
<String>['install'],
workingDirectory: podfile.parent.path,
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
}
await runCommand(flutter,

8
dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart
View File

@@ -17,7 +17,13 @@ Future<void> main() async {
'${flutterDirectory.path}/examples/flutter_view/ios',
);
await inDirectory(iosDirectory, () async {
await exec('pod', <String>['install']);
await exec(
'pod',
<String>['install'],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
});
final TaskFunction taskFunction = createFlutterViewStartupTest();

16
dev/devicelab/bin/tasks/module_test_ios.dart
View File

@@ -242,7 +242,13 @@ Future<void> main() async {
final File objectiveCAnalyticsOutputFile = File(path.join(tempDir.path, 'analytics-objc.log'));
final Directory objectiveCBuildDirectory = Directory(path.join(tempDir.path, 'build-objc'));
await inDirectory(objectiveCHostApp, () async {
await exec('pod', <String>['install']);
await exec(
'pod',
<String>['install'],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
await exec(
'xcodebuild',
<String>[
@@ -325,7 +331,13 @@ Future<void> main() async {
final Directory swiftBuildDirectory = Directory(path.join(tempDir.path, 'build-swift'));
await inDirectory(swiftHostApp, () async {
await exec('pod', <String>['install']);
await exec(
'pod',
<String>['install'],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
await exec(
'xcodebuild',
<String>[

8
dev/devicelab/bin/tasks/platform_view_ios__start_up.dart
View File

@@ -24,7 +24,13 @@ Future<void> main() async {
'$platformViewDirectoryPath/ios',
);
await inDirectory(iosDirectory, () async {
await exec('pod', <String>['install']);
await exec(
'pod',
<String>['install'],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
});
final TaskFunction taskFunction = createPlatformViewStartupTest();

6
dev/devicelab/bin/tasks/plugin_lint_mac.dart
View File

@@ -45,6 +45,9 @@ Future<void> main() async {
objcPodspecPath,
'--allow-warnings',
],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
});
@@ -60,6 +63,9 @@ Future<void> main() async {
'--allow-warnings',
'--use-libraries',
],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
);
});

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

@@ -77,7 +77,12 @@ class CocoaPods {
processUtils.exitsHappy(<String>['which', 'pod']);
Future<String> get cocoaPodsVersionText {
_versionText ??= processUtils.run(<String>['pod', '--version']).then<String>((RunResult result) {
_versionText ??= processUtils.run(
<String>['pod', '--version'],
environment: <String, String>{
'LANG': 'en_US.UTF-8',
},
).then<String>((RunResult result) {
return result.exitCode == 0 ? result.stdout.trim() : null;
}, onError: (dynamic _) => null);
return _versionText;
@@ -305,6 +310,7 @@ class CocoaPods {
// See https://github.com/flutter/flutter/issues/10873.
// CocoaPods analytics adds a lot of latency.
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
);
status.stop();

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

@@ -80,12 +80,12 @@ void main() {
when(mockProcessManager.run(
<String>['pod', 'install', '--verbose'],
workingDirectory: 'project/ios',
environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': 'engine/path', 'COCOAPODS_DISABLE_STATS': 'true'},
environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': 'engine/path', 'COCOAPODS_DISABLE_STATS': 'true', 'LANG': 'en_US.UTF-8'},
)).thenAnswer((_) async => exitsHappy());
when(mockProcessManager.run(
<String>['pod', 'install', '--verbose'],
workingDirectory: 'project/macos',
environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': 'engine/path', 'COCOAPODS_DISABLE_STATS': 'true'},
environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': 'engine/path', 'COCOAPODS_DISABLE_STATS': 'true', 'LANG': 'en_US.UTF-8'},
)).thenAnswer((_) async => exitsHappy());
});
@@ -368,6 +368,7 @@ void main() {
environment: <String, String>{
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
)).thenAnswer((_) async => exitsWithError(
'''
@@ -420,7 +421,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
verify(mockProcessManager.run(
<String>['pod', 'install', '--verbose'],
workingDirectory: 'project/ios',
environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': 'engine/path', 'COCOAPODS_DISABLE_STATS': 'true'},
environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': 'engine/path', 'COCOAPODS_DISABLE_STATS': 'true', 'LANG': 'en_US.UTF-8'},
));
}, overrides: <Type, Generator>{
FileSystem: () => fs,
@@ -447,6 +448,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
environment: <String, String>{
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
));
}, overrides: <Type, Generator>{
@@ -477,6 +479,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
environment: <String, String>{
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
));
}, overrides: <Type, Generator>{
@@ -507,6 +510,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
environment: <String, String>{
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
));
}, overrides: <Type, Generator>{
@@ -539,6 +543,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
environment: <String, String>{
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
));
}, overrides: <Type, Generator>{
@@ -591,6 +596,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
environment: <String, String>{
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'LANG': 'en_US.UTF-8',
},
)).thenAnswer(
(_) async => exitsWithError()
@@ -621,6 +627,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
'FLUTTER_FRAMEWORK_DIR': 'engine/path',
'COCOAPODS_DISABLE_STATS': 'true',
'CP_REPOS_DIR': cocoapodsRepoDir,
'LANG': 'en_US.UTF8',
};
});
@@ -629,7 +636,6 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
fs.file(fs.path.join('project', 'ios', 'Podfile'))
..createSync()
..writeAsStringSync('Existing Podfile');
when(mockProcessManager.run(
<String>['pod', 'install', '--verbose'],
workingDirectory: 'project/ios',