Unverified Commit 6728d484 authored by Chris Bracken's avatar Chris Bracken Committed by GitHub

Revert "Require Xcode 9.0 or later for iOS builds (#13608)" (#13612)

Our devicelab machines have not yet been upgraded to Xcode 9. Once this
has been done, I'll re-land this.

This reverts commit 0fac5f01.
parent 0fac5f01
...@@ -25,7 +25,7 @@ import 'cocoapods.dart'; ...@@ -25,7 +25,7 @@ import 'cocoapods.dart';
import 'code_signing.dart'; import 'code_signing.dart';
import 'xcodeproj.dart'; import 'xcodeproj.dart';
const int kXcodeRequiredVersionMajor = 9; const int kXcodeRequiredVersionMajor = 8;
const int kXcodeRequiredVersionMinor = 0; const int kXcodeRequiredVersionMinor = 0;
// The Python `six` module is a dependency for Xcode builds, and installed by // The Python `six` module is a dependency for Xcode builds, and installed by
...@@ -544,4 +544,4 @@ Future<bool> upgradePbxProjWithFlutterAssets(String app) async { ...@@ -544,4 +544,4 @@ Future<bool> upgradePbxProjWithFlutterAssets(String app) async {
lines.forEach(buffer.writeln); lines.forEach(buffer.writeln);
await xcodeProjectFile.writeAsString(buffer.toString()); await xcodeProjectFile.writeAsString(buffer.toString());
return true; return true;
} }
\ No newline at end of file
...@@ -187,7 +187,7 @@ void main() { ...@@ -187,7 +187,7 @@ void main() {
testUsingContext('xcodeVersionSatisfactory is false when version is less than minimum', () { testUsingContext('xcodeVersionSatisfactory is false when version is less than minimum', () {
when(mockProcessManager.runSync(<String>['/usr/bin/xcodebuild', '-version'])) when(mockProcessManager.runSync(<String>['/usr/bin/xcodebuild', '-version']))
.thenReturn(new ProcessResult(1, 0, 'Xcode 8.3.3\nBuild version 8E3004b', '')); .thenReturn(new ProcessResult(1, 0, 'Xcode 7.0.1\nBuild version 7A1001', ''));
expect(xcode.xcodeVersionSatisfactory, isFalse); expect(xcode.xcodeVersionSatisfactory, isFalse);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
...@@ -203,7 +203,7 @@ void main() { ...@@ -203,7 +203,7 @@ void main() {
testUsingContext('xcodeVersionSatisfactory is true when version meets minimum', () { testUsingContext('xcodeVersionSatisfactory is true when version meets minimum', () {
when(mockProcessManager.runSync(<String>['/usr/bin/xcodebuild', '-version'])) when(mockProcessManager.runSync(<String>['/usr/bin/xcodebuild', '-version']))
.thenReturn(new ProcessResult(1, 0, 'Xcode 9.0\nBuild version 9A235', '')); .thenReturn(new ProcessResult(1, 0, 'Xcode 8.3.3\nBuild version 8E3004b', ''));
expect(xcode.xcodeVersionSatisfactory, isTrue); expect(xcode.xcodeVersionSatisfactory, isTrue);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
...@@ -211,7 +211,7 @@ void main() { ...@@ -211,7 +211,7 @@ void main() {
testUsingContext('xcodeVersionSatisfactory is true when version exceeds minimum', () { testUsingContext('xcodeVersionSatisfactory is true when version exceeds minimum', () {
when(mockProcessManager.runSync(<String>['/usr/bin/xcodebuild', '-version'])) when(mockProcessManager.runSync(<String>['/usr/bin/xcodebuild', '-version']))
.thenReturn(new ProcessResult(1, 0, 'Xcode 10.0\nBuild version 10A123', '')); .thenReturn(new ProcessResult(1, 0, 'Xcode 9.0\nBuild version 9M137d', ''));
expect(xcode.xcodeVersionSatisfactory, isTrue); expect(xcode.xcodeVersionSatisfactory, isTrue);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
......
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