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
ab6f2fc8
Unverified
Commit
ab6f2fc8
authored
Sep 16, 2021
by
Jenn Magder
Committed by
GitHub
Sep 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set BUILD_DIR when determining if plugins support arm64 simulators (#90088)
parent
bf66cc2e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
0 deletions
+21
-0
plugin_lint_mac.dart
dev/devicelab/bin/tasks/plugin_lint_mac.dart
+7
-0
xcodeproj.dart
packages/flutter_tools/lib/src/ios/xcodeproj.dart
+3
-0
.gitignore
...es/flutter_tools/templates/app_shared/ios.tmpl/.gitignore
+1
-0
.gitignore
.../flutter_tools/templates/app_shared/macos.tmpl/.gitignore
+1
-0
xcodeproj_test.dart
.../flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+9
-0
No files found.
dev/devicelab/bin/tasks/plugin_lint_mac.dart
View file @
ab6f2fc8
...
...
@@ -499,6 +499,13 @@ void _validateIosPodfile(String appPath) {
'test_plugin_swift'
,
'ios'
,
));
// Make sure no Xcode build settings are leaking derived data/build directory into the ios directory.
checkDirectoryNotExists
(
path
.
join
(
appPath
,
'ios'
,
'build'
,
));
}
void
_validateMacOSPodfile
(
String
appPath
)
{
...
...
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file @
ab6f2fc8
...
...
@@ -228,6 +228,7 @@ class XcodeProjectInterpreter {
return
null
;
}
final
Status
status
=
_logger
.
startSpinner
();
final
String
buildDirectory
=
_fileSystem
.
path
.
absolute
(
getIosBuildDirectory
());
final
List
<
String
>
showBuildSettingsCommand
=
<
String
>[
...
xcrunCommand
(),
'xcodebuild'
,
...
...
@@ -237,6 +238,8 @@ class XcodeProjectInterpreter {
'-project'
,
podXcodeProject
.
path
,
'-showBuildSettings'
,
'BUILD_DIR=
$buildDirectory
'
,
'OBJROOT=
$buildDirectory
'
,
];
try
{
// showBuildSettings is reported to occasionally timeout. Here, we give it
...
...
packages/flutter_tools/templates/app_shared/ios.tmpl/.gitignore
View file @
ab6f2fc8
**/dgph
*.mode1v3
*.mode2v3
*.moved-aside
...
...
packages/flutter_tools/templates/app_shared/macos.tmpl/.gitignore
View file @
ab6f2fc8
...
...
@@ -3,4 +3,5 @@
**/Pods/
# Xcode-related
**/dgph
**/xcuserdata/
packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
View file @
ab6f2fc8
...
...
@@ -695,6 +695,7 @@ Information about project "Runner":
final
Directory
podXcodeProject
=
project
.
ios
.
hostAppRoot
.
childDirectory
(
'Pods'
).
childDirectory
(
'Pods.xcodeproj'
)
..
createSync
(
recursive:
true
);
final
String
buildDirectory
=
fileSystem
.
path
.
absolute
(
'build'
,
'ios'
);
fakeProcessManager
.
addCommands
(<
FakeCommand
>[
kWhichSysctlCommand
,
kARMCheckCommand
,
...
...
@@ -710,6 +711,8 @@ Information about project "Runner":
'-project'
,
podXcodeProject
.
path
,
'-showBuildSettings'
,
'BUILD_DIR=
$buildDirectory
'
,
'OBJROOT=
$buildDirectory
'
,
],
stdout:
'''
Build settings for action build and target plugin1:
...
...
@@ -748,6 +751,7 @@ Build settings for action build and target plugin2:
final
Directory
podXcodeProject
=
project
.
ios
.
hostAppRoot
.
childDirectory
(
'Pods'
).
childDirectory
(
'Pods.xcodeproj'
)
..
createSync
(
recursive:
true
);
final
String
buildDirectory
=
fileSystem
.
path
.
absolute
(
'build'
,
'ios'
);
fakeProcessManager
.
addCommands
(<
FakeCommand
>[
kWhichSysctlCommand
,
kARMCheckCommand
,
...
...
@@ -763,6 +767,8 @@ Build settings for action build and target plugin2:
'-project'
,
podXcodeProject
.
path
,
'-showBuildSettings'
,
'BUILD_DIR=
$buildDirectory
'
,
'OBJROOT=
$buildDirectory
'
,
],
exitCode:
1
,
),
...
...
@@ -789,6 +795,7 @@ Build settings for action build and target plugin2:
final
Directory
podXcodeProject
=
project
.
ios
.
hostAppRoot
.
childDirectory
(
'Pods'
).
childDirectory
(
'Pods.xcodeproj'
)
..
createSync
(
recursive:
true
);
final
String
buildDirectory
=
fileSystem
.
path
.
absolute
(
'build'
,
'ios'
);
fakeProcessManager
.
addCommands
(<
FakeCommand
>[
kWhichSysctlCommand
,
kARMCheckCommand
,
...
...
@@ -804,6 +811,8 @@ Build settings for action build and target plugin2:
'-project'
,
podXcodeProject
.
path
,
'-showBuildSettings'
,
'BUILD_DIR=
$buildDirectory
'
,
'OBJROOT=
$buildDirectory
'
,
],
stdout:
'''
Build settings for action build and target plugin1:
...
...
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