Unverified Commit a62bb3d9 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Update minimum version to Xcode 10.2 (#42254)

parent e2c5fd6c
...@@ -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:
......
...@@ -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>();
......
...@@ -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\nBuild version 8E3004b', '')); .thenReturn(ProcessResult(1, 0, 'Xcode 10.3.3\nBuild 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', () {
......
...@@ -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(10); when(mockXcodeProjectInterpreter.majorVersion).thenReturn(11);
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,
......
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment