Commit 7e59a9e8 authored by Chinmay Garde's avatar Chinmay Garde

Address issues raised in PR #2047

parent 6ab25977
......@@ -32,11 +32,7 @@ class IOSWorkflow extends Workflow {
};
Function _xcodeVersionSatisfactory = () {
if (xcode.isInstalledAndMeetsVersionCheck) {
return ValidationType.installed;
}
return ValidationType.missing;
return xcode.isInstalledAndMeetsVersionCheck ? ValidationType.installed : ValidationType.missing;
};
Function _xcodeEulaSigned = () {
......
......@@ -73,17 +73,25 @@ class XCode {
int major = int.parse(components[0]);
int minor = components.length == 1 ? 0 : int.parse(components[1]);
_xcodeVersionSatisfactory = major >= kXcodeRequiredVersionMajor && minor >= kXcodeRequiredVersionMinor;
return _xcodeVersionSatisfactory;
_xcodeVersionSatisfactory = _xcodeVersionCheckValid(major, minor);
} catch (error) {
_xcodeVersionSatisfactory = false;
return false;
}
return false;
return _xcodeVersionSatisfactory;
}
}
bool _xcodeVersionCheckValid(int major, int minor) {
if (major > kXcodeRequiredVersionMajor)
return true;
if (major == kXcodeRequiredVersionMajor)
return minor >= kXcodeRequiredVersionMinor;
return false;
}
Future<bool> buildIOSXcodeProject(ApplicationPackage app, { bool buildForDevice }) async {
String flutterProjectPath = Directory.current.path;
......
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