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
a62bb3d9
Unverified
Commit
a62bb3d9
authored
Oct 14, 2019
by
Jenn Magder
Committed by
GitHub
Oct 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update minimum version to Xcode 10.2 (#42254)
parent
e2c5fd6c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
21 deletions
+21
-21
.cirrus.yml
.cirrus.yml
+2
-2
xcode.dart
packages/flutter_tools/lib/src/macos/xcode.dart
+2
-2
xcodeproj_test.dart
.../flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+2
-2
xcode_test.dart
...es/flutter_tools/test/general.shard/macos/xcode_test.dart
+13
-13
context.dart
packages/flutter_tools/test/src/context.dart
+2
-2
No files found.
.cirrus.yml
View file @
a62bb3d9
...
@@ -440,7 +440,7 @@ task:
...
@@ -440,7 +440,7 @@ task:
# Apple Certificates Match Passphrase
# Apple Certificates Match Passphrase
MATCH_PASSWORD
:
ENCRYPTED[db07f252234397090e3ec59152d9ec1831f5ecd0ef97d247b1dca757bbb9ef9b7c832a39bce2caf1949ccdf097e59a73]
MATCH_PASSWORD
:
ENCRYPTED[db07f252234397090e3ec59152d9ec1831f5ecd0ef97d247b1dca757bbb9ef9b7c832a39bce2caf1949ccdf097e59a73]
osx_instance
:
osx_instance
:
image
:
mojave-xcode-10.
1
image
:
mojave-xcode-10.
2
# occasionally the clock on these machines is out of sync
# occasionally the clock on these machines is out of sync
# with the actual time - this should help to verify
# with the actual time - this should help to verify
print_date_script
:
print_date_script
:
...
@@ -460,7 +460,7 @@ task:
...
@@ -460,7 +460,7 @@ task:
task
:
task
:
use_compute_credits
:
$CIRRUS_USER_COLLABORATOR == 'true'
use_compute_credits
:
$CIRRUS_USER_COLLABORATOR == 'true'
osx_instance
:
osx_instance
:
image
:
mojave-xcode-10.
1
image
:
mojave-xcode-10.
2
depends_on
:
depends_on
:
-
analyze
-
analyze
env
:
env
:
...
...
packages/flutter_tools/lib/src/macos/xcode.dart
View file @
a62bb3d9
...
@@ -12,8 +12,8 @@ import '../base/platform.dart';
...
@@ -12,8 +12,8 @@ import '../base/platform.dart';
import
'../base/process.dart'
;
import
'../base/process.dart'
;
import
'../ios/xcodeproj.dart'
;
import
'../ios/xcodeproj.dart'
;
const
int
kXcodeRequiredVersionMajor
=
9
;
const
int
kXcodeRequiredVersionMajor
=
10
;
const
int
kXcodeRequiredVersionMinor
=
0
;
const
int
kXcodeRequiredVersionMinor
=
2
;
Xcode
get
xcode
=>
context
.
get
<
Xcode
>();
Xcode
get
xcode
=>
context
.
get
<
Xcode
>();
...
...
packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
View file @
a62bb3d9
...
@@ -79,8 +79,8 @@ void main() {
...
@@ -79,8 +79,8 @@ void main() {
testUsingOsxContext
(
'majorVersion returns major version'
,
()
{
testUsingOsxContext
(
'majorVersion returns major version'
,
()
{
when
(
mockProcessManager
.
runSync
(<
String
>[
xcodebuild
,
'-version'
]))
when
(
mockProcessManager
.
runSync
(<
String
>[
xcodebuild
,
'-version'
]))
.
thenReturn
(
ProcessResult
(
1
,
0
,
'Xcode
8
.3.3
\n
Build version 8E3004b'
,
''
));
.
thenReturn
(
ProcessResult
(
1
,
0
,
'Xcode
10
.3.3
\n
Build version 8E3004b'
,
''
));
expect
(
xcodeProjectInterpreter
.
majorVersion
,
8
);
expect
(
xcodeProjectInterpreter
.
majorVersion
,
10
);
});
});
testUsingOsxContext
(
'majorVersion is null when version has unexpected format'
,
()
{
testUsingOsxContext
(
'majorVersion is null when version has unexpected format'
,
()
{
...
...
packages/flutter_tools/test/general.shard/macos/xcode_test.dart
View file @
a62bb3d9
...
@@ -52,8 +52,8 @@ void main() {
...
@@ -52,8 +52,8 @@ void main() {
testUsingContext
(
'xcodeVersionSatisfactory is false when version is less than minimum'
,
()
{
testUsingContext
(
'xcodeVersionSatisfactory is false when version is less than minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
8
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
17
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
expect
(
xcode
.
isVersionSatisfactory
,
isFalse
);
expect
(
xcode
.
isVersionSatisfactory
,
isFalse
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
...
@@ -68,8 +68,8 @@ void main() {
...
@@ -68,8 +68,8 @@ void main() {
testUsingContext
(
'xcodeVersionSatisfactory is true when version meets minimum'
,
()
{
testUsingContext
(
'xcodeVersionSatisfactory is true when version meets minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
10
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
...
@@ -77,8 +77,8 @@ void main() {
...
@@ -77,8 +77,8 @@ void main() {
testUsingContext
(
'xcodeVersionSatisfactory is true when major version exceeds minimum'
,
()
{
testUsingContext
(
'xcodeVersionSatisfactory is true when major version exceeds minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
0
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
...
@@ -86,8 +86,8 @@ void main() {
...
@@ -86,8 +86,8 @@ void main() {
testUsingContext
(
'xcodeVersionSatisfactory is true when minor version exceeds minimum'
,
()
{
testUsingContext
(
'xcodeVersionSatisfactory is true when minor version exceeds minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
10
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
3
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
...
@@ -123,8 +123,8 @@ void main() {
...
@@ -123,8 +123,8 @@ void main() {
.
thenReturn
(
ProcessResult
(
1
,
127
,
''
,
'ERROR'
));
.
thenReturn
(
ProcessResult
(
1
,
127
,
''
,
'ERROR'
));
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
10
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isFalse
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isFalse
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
...
@@ -141,7 +141,7 @@ void main() {
...
@@ -141,7 +141,7 @@ void main() {
.
thenReturn
(
ProcessResult
(
1
,
0
,
xcodePath
,
''
));
.
thenReturn
(
ProcessResult
(
1
,
0
,
xcodePath
,
''
));
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
8
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isFalse
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isFalse
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
...
@@ -158,8 +158,8 @@ void main() {
...
@@ -158,8 +158,8 @@ void main() {
.
thenReturn
(
ProcessResult
(
1
,
0
,
xcodePath
,
''
));
.
thenReturn
(
ProcessResult
(
1
,
0
,
xcodePath
,
''
));
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
10
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isTrue
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isTrue
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
XcodeProjectInterpreter:
()
=>
mockXcodeProjectInterpreter
,
...
...
packages/flutter_tools/test/src/context.dart
View file @
a62bb3d9
...
@@ -343,10 +343,10 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
...
@@ -343,10 +343,10 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
bool
get
isInstalled
=>
true
;
bool
get
isInstalled
=>
true
;
@override
@override
String
get
versionText
=>
'Xcode
9
.2'
;
String
get
versionText
=>
'Xcode
10
.2'
;
@override
@override
int
get
majorVersion
=>
9
;
int
get
majorVersion
=>
10
;
@override
@override
int
get
minorVersion
=>
2
;
int
get
minorVersion
=>
2
;
...
...
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