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
31933af4
Unverified
Commit
31933af4
authored
Nov 05, 2021
by
Jenn Magder
Committed by
GitHub
Nov 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update minimum required version to Xcode 12.3 (#93094)
parent
296eeb59
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
xcode.dart
packages/flutter_tools/lib/src/macos/xcode.dart
+2
-2
xcode_test.dart
...es/flutter_tools/test/general.shard/macos/xcode_test.dart
+5
-5
xcode_validator_test.dart
..._tools/test/general.shard/macos/xcode_validator_test.dart
+3
-3
context.dart
packages/flutter_tools/test/src/context.dart
+2
-2
No files found.
packages/flutter_tools/lib/src/macos/xcode.dart
View file @
31933af4
...
...
@@ -18,11 +18,11 @@ import '../base/version.dart';
import
'../build_info.dart'
;
import
'../ios/xcodeproj.dart'
;
Version
get
xcodeRequiredVersion
=>
Version
(
12
,
0
,
1
,
text:
'12.0.1
'
);
Version
get
xcodeRequiredVersion
=>
Version
(
12
,
3
,
null
,
text:
'12.3
'
);
/// Diverging this number from the minimum required version will provide a doctor
/// warning, not error, that users should upgrade Xcode.
Version
get
xcodeRecommendedVersion
=>
Version
(
13
,
0
,
0
,
text:
'13.0.0
'
);
Version
get
xcodeRecommendedVersion
=>
Version
(
13
,
null
,
null
,
text:
'13
'
);
/// SDK name passed to `xcrun --sdk`. Corresponds to undocumented Xcode
/// SUPPORTED_PLATFORMS values.
...
...
packages/flutter_tools/test/general.shard/macos/xcode_test.dart
View file @
31933af4
...
...
@@ -148,7 +148,7 @@ void main() {
testWithoutContext
(
'xcodeVersionSatisfactory is true when version meets minimum'
,
()
{
xcodeProjectInterpreter
.
isInstalled
=
true
;
xcodeProjectInterpreter
.
version
=
Version
(
12
,
0
,
1
);
xcodeProjectInterpreter
.
version
=
Version
(
12
,
3
,
null
);
expect
(
xcode
.
isRequiredVersionSatisfactory
,
isTrue
);
});
...
...
@@ -162,21 +162,21 @@ void main() {
testWithoutContext
(
'xcodeVersionSatisfactory is true when minor version exceeds minimum'
,
()
{
xcodeProjectInterpreter
.
isInstalled
=
true
;
xcodeProjectInterpreter
.
version
=
Version
(
12
,
3
,
0
);
xcodeProjectInterpreter
.
version
=
Version
(
12
,
5
,
0
);
expect
(
xcode
.
isRequiredVersionSatisfactory
,
isTrue
);
});
testWithoutContext
(
'xcodeVersionSatisfactory is true when patch version exceeds minimum'
,
()
{
xcodeProjectInterpreter
.
isInstalled
=
true
;
xcodeProjectInterpreter
.
version
=
Version
(
12
,
0
,
2
);
xcodeProjectInterpreter
.
version
=
Version
(
12
,
3
,
1
);
expect
(
xcode
.
isRequiredVersionSatisfactory
,
isTrue
);
});
testWithoutContext
(
'isRecommendedVersionSatisfactory is false when version is less than minimum'
,
()
{
xcodeProjectInterpreter
.
isInstalled
=
true
;
xcodeProjectInterpreter
.
version
=
Version
(
1
1
,
0
,
0
);
xcodeProjectInterpreter
.
version
=
Version
(
1
2
,
null
,
null
);
expect
(
xcode
.
isRecommendedVersionSatisfactory
,
isFalse
);
});
...
...
@@ -232,7 +232,7 @@ void main() {
testWithoutContext
(
'isInstalledAndMeetsVersionCheck is true when macOS and installed and version is satisfied'
,
()
{
xcodeProjectInterpreter
.
isInstalled
=
true
;
xcodeProjectInterpreter
.
version
=
Version
(
12
,
0
,
1
);
xcodeProjectInterpreter
.
version
=
Version
(
12
,
3
,
null
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isTrue
);
expect
(
fakeProcessManager
.
hasRemainingExpectations
,
isFalse
);
...
...
packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
View file @
31933af4
...
...
@@ -56,20 +56,20 @@ void main() {
final
ValidationResult
result
=
await
validator
.
validate
();
expect
(
result
.
type
,
ValidationType
.
partial
);
expect
(
result
.
messages
.
last
.
type
,
ValidationMessageType
.
error
);
expect
(
result
.
messages
.
last
.
message
,
contains
(
'Flutter requires a minimum Xcode version of 12.
0.1
'
));
expect
(
result
.
messages
.
last
.
message
,
contains
(
'Flutter requires a minimum Xcode version of 12.
3
'
));
});
testWithoutContext
(
'Emits partial status when Xcode below recommended version'
,
()
async
{
final
ProcessManager
processManager
=
FakeProcessManager
.
any
();
final
Xcode
xcode
=
Xcode
.
test
(
processManager:
processManager
,
xcodeProjectInterpreter:
XcodeProjectInterpreter
.
test
(
processManager:
processManager
,
version:
Version
(
12
,
0
,
1
)),
xcodeProjectInterpreter:
XcodeProjectInterpreter
.
test
(
processManager:
processManager
,
version:
Version
(
12
,
4
,
null
)),
);
final
XcodeValidator
validator
=
XcodeValidator
(
xcode:
xcode
,
userMessages:
UserMessages
());
final
ValidationResult
result
=
await
validator
.
validate
();
expect
(
result
.
type
,
ValidationType
.
partial
);
expect
(
result
.
messages
.
last
.
type
,
ValidationMessageType
.
hint
);
expect
(
result
.
messages
.
last
.
message
,
contains
(
'Flutter recommends a minimum Xcode version of 13
.0.0
'
));
expect
(
result
.
messages
.
last
.
message
,
contains
(
'Flutter recommends a minimum Xcode version of 13'
));
});
testWithoutContext
(
'Emits partial status when Xcode EULA not signed'
,
()
async
{
...
...
packages/flutter_tools/test/src/context.dart
View file @
31933af4
...
...
@@ -294,10 +294,10 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
bool
get
isInstalled
=>
true
;
@override
String
get
versionText
=>
'Xcode 12.
0.1
'
;
String
get
versionText
=>
'Xcode 12.
3
'
;
@override
Version
get
version
=>
Version
(
12
,
0
,
1
);
Version
get
version
=>
Version
(
12
,
3
,
null
);
@override
Future
<
Map
<
String
,
String
>>
getBuildSettings
(
...
...
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