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
48a9bd56
Unverified
Commit
48a9bd56
authored
Feb 07, 2020
by
Jenn Magder
Committed by
GitHub
Feb 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Update minimum version to Xcode 11.0 (#50315)" (#50369)
This reverts commit
2b7582ef
.
parent
2b7582ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
19 deletions
+19
-19
xcode.dart
packages/flutter_tools/lib/src/macos/xcode.dart
+2
-2
xcodeproj_test.dart
.../flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+3
-3
xcode_test.dart
...es/flutter_tools/test/general.shard/macos/xcode_test.dart
+11
-11
context.dart
packages/flutter_tools/test/src/context.dart
+3
-3
No files found.
packages/flutter_tools/lib/src/macos/xcode.dart
View file @
48a9bd56
...
...
@@ -19,8 +19,8 @@ import '../ios/devices.dart';
import
'../ios/xcodeproj.dart'
;
import
'../reporting/reporting.dart'
;
const
int
kXcodeRequiredVersionMajor
=
1
1
;
const
int
kXcodeRequiredVersionMinor
=
0
;
const
int
kXcodeRequiredVersionMajor
=
1
0
;
const
int
kXcodeRequiredVersionMinor
=
2
;
enum
SdkType
{
iPhone
,
...
...
packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
View file @
48a9bd56
...
...
@@ -90,9 +90,9 @@ void main() {
testWithoutContext
(
'xcodebuild majorVersion returns major version'
,
()
{
when
(
processManager
.
runSync
(<
String
>[
xcodebuild
,
'-version'
]))
.
thenReturn
(
ProcessResult
(
1
,
0
,
'Xcode 1
1.4.1
\n
Build version 11N111s
'
,
''
));
.
thenReturn
(
ProcessResult
(
1
,
0
,
'Xcode 1
0.3.3
\n
Build version 8E3004b
'
,
''
));
expect
(
xcodeProjectInterpreter
.
majorVersion
,
1
1
);
expect
(
xcodeProjectInterpreter
.
majorVersion
,
1
0
);
});
testWithoutContext
(
'xcodebuild majorVersion is null when version has unexpected format'
,
()
{
...
...
@@ -102,7 +102,7 @@ void main() {
expect
(
xcodeProjectInterpreter
.
majorVersion
,
isNull
);
});
testWithoutContext
(
'xcodebuild
m
inorVersion returns minor version'
,
()
{
testWithoutContext
(
'xcodebuild inorVersion returns minor version'
,
()
{
when
(
processManager
.
runSync
(<
String
>[
xcodebuild
,
'-version'
]))
.
thenReturn
(
ProcessResult
(
1
,
0
,
'Xcode 8.3.3
\n
Build version 8E3004b'
,
''
));
...
...
packages/flutter_tools/test/general.shard/macos/xcode_test.dart
View file @
48a9bd56
...
...
@@ -83,23 +83,23 @@ void main() {
testWithoutContext
(
'xcodeVersionSatisfactory is true when version meets minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
});
testWithoutContext
(
'xcodeVersionSatisfactory is true when major version exceeds minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
2
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
});
testWithoutContext
(
'xcodeVersionSatisfactory is true when minor version exceeds minimum'
,
()
{
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
1
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
3
);
expect
(
xcode
.
isVersionSatisfactory
,
isTrue
);
...
...
@@ -126,8 +126,8 @@ void main() {
when
(
processManager
.
runSync
(<
String
>[
'/usr/bin/xcode-select'
,
'--print-path'
]))
.
thenReturn
(
ProcessResult
(
1
,
127
,
''
,
'ERROR'
));
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isFalse
);
});
...
...
@@ -138,8 +138,8 @@ void main() {
when
(
processManager
.
runSync
(<
String
>[
'/usr/bin/xcode-select'
,
'--print-path'
]))
.
thenReturn
(
ProcessResult
(
1
,
0
,
xcodePath
,
''
));
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
10
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
9
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isFalse
);
});
...
...
@@ -150,8 +150,8 @@ void main() {
when
(
processManager
.
runSync
(<
String
>[
'/usr/bin/xcode-select'
,
'--print-path'
]))
.
thenReturn
(
ProcessResult
(
1
,
0
,
xcodePath
,
''
));
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
1
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
0
);
when
(
mockXcodeProjectInterpreter
.
majorVersion
).
thenReturn
(
1
0
);
when
(
mockXcodeProjectInterpreter
.
minorVersion
).
thenReturn
(
2
);
expect
(
xcode
.
isInstalledAndMeetsVersionCheck
,
isTrue
);
});
...
...
packages/flutter_tools/test/src/context.dart
View file @
48a9bd56
...
...
@@ -366,13 +366,13 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
bool
get
isInstalled
=>
true
;
@override
String
get
versionText
=>
'Xcode 1
1.0
'
;
String
get
versionText
=>
'Xcode 1
0.2
'
;
@override
int
get
majorVersion
=>
1
1
;
int
get
majorVersion
=>
1
0
;
@override
int
get
minorVersion
=>
0
;
int
get
minorVersion
=>
2
;
@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