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
8b79bb97
Unverified
Commit
8b79bb97
authored
Jun 23, 2020
by
Jenn Magder
Committed by
GitHub
Jun 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for Xcode 11 and Xcode 12 directory names in build_ios_framework_module_test (#60045)
parent
c8e53b38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
8 deletions
+30
-8
build_ios_framework_module_test.dart
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
+30
-8
No files found.
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
View file @
8b79bb97
...
...
@@ -109,14 +109,36 @@ Future<void> main() async {
}
await
_checkFrameworkArchs
(
debugAppFrameworkPath
,
'Debug'
);
checkFileExists
(
path
.
join
(
// Xcode changed the name of this generated directory in Xcode 12.
const
String
xcode11ArmDirectoryName
=
'ios-armv7_arm64'
;
const
String
xcode12ArmDirectoryName
=
'ios-arm64_armv7'
;
final
String
xcode11AppFrameworkDirectory
=
path
.
join
(
outputPath
,
'Debug'
,
'App.xcframework'
,
'ios-armv7_arm64'
,
xcode11ArmDirectoryName
,
'App.framework'
,
'App'
,
));
);
final
String
xcode12AppFrameworkDirectory
=
path
.
join
(
outputPath
,
'Debug'
,
'App.xcframework'
,
xcode12ArmDirectoryName
,
'App.framework'
,
'App'
,
);
// This seemed easier than an explicit Xcode version check.
String
xcodeArmDirectoryName
;
if
(
exists
(
File
(
xcode11AppFrameworkDirectory
)))
{
xcodeArmDirectoryName
=
xcode11ArmDirectoryName
;
}
else
if
(
exists
(
File
(
xcode12AppFrameworkDirectory
)))
{
xcodeArmDirectoryName
=
xcode12ArmDirectoryName
;
}
else
{
throw
const
FileSystemException
(
'Expected App.framework binary to exist.'
);
}
checkFileExists
(
path
.
join
(
outputPath
,
...
...
@@ -158,7 +180,7 @@ Future<void> main() async {
outputPath
,
mode
,
'App.xcframework'
,
'ios-armv7_arm64'
,
xcodeArmDirectoryName
,
'App.framework'
,
'App'
,
));
...
...
@@ -190,7 +212,7 @@ Future<void> main() async {
outputPath
,
mode
,
'Flutter.xcframework'
,
'ios-armv7_arm64'
,
xcodeArmDirectoryName
,
'Flutter.framework'
,
'Flutter'
,
));
...
...
@@ -234,7 +256,7 @@ Future<void> main() async {
outputPath
,
mode
,
'device_info.xcframework'
,
'ios-armv7_arm64'
,
xcodeArmDirectoryName
,
'device_info.framework'
,
'device_info'
,
));
...
...
@@ -243,7 +265,7 @@ Future<void> main() async {
outputPath
,
mode
,
'device_info.xcframework'
,
'ios-armv7_arm64'
,
xcodeArmDirectoryName
,
'device_info.framework'
,
'Headers'
,
'DeviceInfoPlugin.h'
,
...
...
@@ -301,7 +323,7 @@ Future<void> main() async {
outputPath
,
mode
,
'FlutterPluginRegistrant.xcframework'
,
'ios-armv7_arm64'
,
xcodeArmDirectoryName
,
'FlutterPluginRegistrant.framework'
,
'Headers'
,
'GeneratedPluginRegistrant.h'
,
...
...
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