diff --git a/.cirrus.yml b/.cirrus.yml index a153ae76e41..fe1a97f48fd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -440,7 +440,7 @@ task: # Apple Certificates Match Passphrase MATCH_PASSWORD: ENCRYPTED[db07f252234397090e3ec59152d9ec1831f5ecd0ef97d247b1dca757bbb9ef9b7c832a39bce2caf1949ccdf097e59a73] osx_instance: - image: mojave-xcode-10.1 + image: mojave-xcode-10.2 # occasionally the clock on these machines is out of sync # with the actual time - this should help to verify print_date_script: @@ -460,7 +460,7 @@ task: task: use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' osx_instance: - image: mojave-xcode-10.1 + image: mojave-xcode-10.2 depends_on: - analyze env: diff --git a/packages/flutter_tools/lib/src/macos/xcode.dart b/packages/flutter_tools/lib/src/macos/xcode.dart index 39146cba6c0..515e6bb17a3 100644 --- a/packages/flutter_tools/lib/src/macos/xcode.dart +++ b/packages/flutter_tools/lib/src/macos/xcode.dart @@ -12,8 +12,8 @@ import '../base/platform.dart'; import '../base/process.dart'; import '../ios/xcodeproj.dart'; -const int kXcodeRequiredVersionMajor = 9; -const int kXcodeRequiredVersionMinor = 0; +const int kXcodeRequiredVersionMajor = 10; +const int kXcodeRequiredVersionMinor = 2; Xcode get xcode => context.get(); diff --git a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart index 48f3cb92090..b362ca0da0b 100644 --- a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart @@ -79,8 +79,8 @@ void main() { testUsingOsxContext('majorVersion returns major version', () { when(mockProcessManager.runSync([xcodebuild, '-version'])) - .thenReturn(ProcessResult(1, 0, 'Xcode 8.3.3\nBuild version 8E3004b', '')); - expect(xcodeProjectInterpreter.majorVersion, 8); + .thenReturn(ProcessResult(1, 0, 'Xcode 10.3.3\nBuild version 8E3004b', '')); + expect(xcodeProjectInterpreter.majorVersion, 10); }); testUsingOsxContext('majorVersion is null when version has unexpected format', () { diff --git a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart index b6c43dca548..378884b3eb0 100644 --- a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart @@ -52,8 +52,8 @@ void main() { testUsingContext('xcodeVersionSatisfactory is false when version is less than minimum', () { when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(8); - when(mockXcodeProjectInterpreter.minorVersion).thenReturn(17); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(9); + when(mockXcodeProjectInterpreter.minorVersion).thenReturn(0); expect(xcode.isVersionSatisfactory, isFalse); }, overrides: { XcodeProjectInterpreter: () => mockXcodeProjectInterpreter, @@ -68,8 +68,8 @@ void main() { testUsingContext('xcodeVersionSatisfactory is true when version meets minimum', () { when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(9); - when(mockXcodeProjectInterpreter.minorVersion).thenReturn(0); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(10); + when(mockXcodeProjectInterpreter.minorVersion).thenReturn(2); expect(xcode.isVersionSatisfactory, isTrue); }, overrides: { XcodeProjectInterpreter: () => mockXcodeProjectInterpreter, @@ -77,8 +77,8 @@ void main() { testUsingContext('xcodeVersionSatisfactory is true when major version exceeds minimum', () { when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(10); - when(mockXcodeProjectInterpreter.minorVersion).thenReturn(0); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(11); + when(mockXcodeProjectInterpreter.minorVersion).thenReturn(2); expect(xcode.isVersionSatisfactory, isTrue); }, overrides: { XcodeProjectInterpreter: () => mockXcodeProjectInterpreter, @@ -86,8 +86,8 @@ void main() { testUsingContext('xcodeVersionSatisfactory is true when minor version exceeds minimum', () { when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(9); - when(mockXcodeProjectInterpreter.minorVersion).thenReturn(1); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(10); + when(mockXcodeProjectInterpreter.minorVersion).thenReturn(3); expect(xcode.isVersionSatisfactory, isTrue); }, overrides: { XcodeProjectInterpreter: () => mockXcodeProjectInterpreter, @@ -123,8 +123,8 @@ void main() { .thenReturn(ProcessResult(1, 127, '', 'ERROR')); when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(9); - when(mockXcodeProjectInterpreter.minorVersion).thenReturn(1); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(10); + when(mockXcodeProjectInterpreter.minorVersion).thenReturn(2); expect(xcode.isInstalledAndMeetsVersionCheck, isFalse); }, overrides: { @@ -141,7 +141,7 @@ void main() { .thenReturn(ProcessResult(1, 0, xcodePath, '')); when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(8); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(9); when(mockXcodeProjectInterpreter.minorVersion).thenReturn(0); expect(xcode.isInstalledAndMeetsVersionCheck, isFalse); }, overrides: { @@ -158,8 +158,8 @@ void main() { .thenReturn(ProcessResult(1, 0, xcodePath, '')); when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); - when(mockXcodeProjectInterpreter.majorVersion).thenReturn(9); - when(mockXcodeProjectInterpreter.minorVersion).thenReturn(1); + when(mockXcodeProjectInterpreter.majorVersion).thenReturn(10); + when(mockXcodeProjectInterpreter.minorVersion).thenReturn(2); expect(xcode.isInstalledAndMeetsVersionCheck, isTrue); }, overrides: { XcodeProjectInterpreter: () => mockXcodeProjectInterpreter, diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index fb2e21c5666..57e44655836 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -343,10 +343,10 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter { bool get isInstalled => true; @override - String get versionText => 'Xcode 9.2'; + String get versionText => 'Xcode 10.2'; @override - int get majorVersion => 9; + int get majorVersion => 10; @override int get minorVersion => 2;