Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
088fa244
Unverified
Commit
088fa244
authored
Dec 02, 2019
by
Dan Field
Committed by
GitHub
Dec 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set the LANG when invoking cocoapods (#45710)
parent
afb8f382
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
9 deletions
+54
-9
test.dart
dev/bots/test.dart
+3
-0
flutter_view_ios__start_up.dart
dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart
+7
-1
module_test_ios.dart
dev/devicelab/bin/tasks/module_test_ios.dart
+14
-2
platform_view_ios__start_up.dart
dev/devicelab/bin/tasks/platform_view_ios__start_up.dart
+7
-1
plugin_lint_mac.dart
dev/devicelab/bin/tasks/plugin_lint_mac.dart
+6
-0
cocoapods.dart
packages/flutter_tools/lib/src/macos/cocoapods.dart
+7
-1
cocoapods_test.dart
...lutter_tools/test/general.shard/macos/cocoapods_test.dart
+10
-4
No files found.
dev/bots/test.dart
View file @
088fa244
...
...
@@ -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
,
...
...
dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart
View file @
088fa244
...
...
@@ -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
();
...
...
dev/devicelab/bin/tasks/module_test_ios.dart
View file @
088fa244
...
...
@@ -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
>[
...
...
dev/devicelab/bin/tasks/platform_view_ios__start_up.dart
View file @
088fa244
...
...
@@ -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
();
...
...
dev/devicelab/bin/tasks/plugin_lint_mac.dart
View file @
088fa244
...
...
@@ -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'
,
},
);
});
...
...
packages/flutter_tools/lib/src/macos/cocoapods.dart
View file @
088fa244
...
...
@@ -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
();
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file @
088fa244
...
...
@@ -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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment