Commit bb8e2a7c authored by Chris Bracken's avatar Chris Bracken Committed by GitHub

Lazily initialise Xcode installation status (#10945)

Rather than pre-compute Xcode install path, version, and EULA status,
compute and cache on demand.
parent 02171dca
...@@ -80,54 +80,58 @@ class IMobileDevice { ...@@ -80,54 +80,58 @@ class IMobileDevice {
} }
class Xcode { class Xcode {
Xcode() { bool get isInstalledAndMeetsVersionCheck => isInstalled && xcodeVersionSatisfactory;
_eulaSigned = false;
String _xcodeSelectPath;
String get xcodeSelectPath {
if (_xcodeSelectPath == null) {
try { try {
_xcodeSelectPath = runSync(<String>['xcode-select', '--print-path'])?.trim(); _xcodeSelectPath = runSync(<String>['/usr/bin/xcode-select', '--print-path'])?.trim();
if (_xcodeSelectPath == null || _xcodeSelectPath.isEmpty) { } on ProcessException {
_isInstalled = false; // Ignore: return null below.
return; }
}
return _xcodeSelectPath;
} }
_isInstalled = true;
_xcodeVersionText = runSync(<String>['xcodebuild', '-version']).replaceAll('\n', ', '); bool get isInstalled {
if (xcodeSelectPath == null || xcodeSelectPath.isEmpty)
return false;
if (!xcodeVersionRegex.hasMatch(xcodeVersionText))
return false;
return true;
}
if (!xcodeVersionRegex.hasMatch(_xcodeVersionText)) { bool _eulaSigned;
_isInstalled = false; /// Has the EULA been signed?
} else { bool get eulaSigned {
if (_eulaSigned == null) {
try { try {
final ProcessResult result = processManager.runSync(<String>['/usr/bin/xcrun', 'clang']); final ProcessResult result = processManager.runSync(<String>['/usr/bin/xcrun', 'clang']);
if (result.stdout != null && result.stdout.contains('license')) if (result.stdout != null && result.stdout.contains('license'))
_eulaSigned = false; _eulaSigned = false;
else if (result.stderr != null && result.stderr.contains('license')) else if (result.stderr != null && result.stderr.contains('license'))
_eulaSigned = false; _eulaSigned = false;
else else
_eulaSigned = true; _eulaSigned = true;
} catch (error) { } on ProcessException {
_eulaSigned = false; _eulaSigned = false;
} }
} }
} catch (error) { return _eulaSigned;
_isInstalled = false;
}
} }
bool get isInstalledAndMeetsVersionCheck => isInstalled && xcodeVersionSatisfactory;
String _xcodeSelectPath;
String get xcodeSelectPath => _xcodeSelectPath;
bool _isInstalled;
bool get isInstalled => _isInstalled;
bool _eulaSigned;
/// Has the EULA been signed?
bool get eulaSigned => _eulaSigned;
String _xcodeVersionText; String _xcodeVersionText;
String get xcodeVersionText => _xcodeVersionText; String get xcodeVersionText {
if (_xcodeVersionText != null) {
try {
_xcodeVersionText = runSync(<String>['/usr/bin/xcodebuild', '-version']).replaceAll('\n', ', ');
} on ProcessException {
// Ignore: return null below.
}
}
return _xcodeVersionText;
}
int _xcodeMajorVersion; int _xcodeMajorVersion;
int get xcodeMajorVersion => _xcodeMajorVersion; int get xcodeMajorVersion => _xcodeMajorVersion;
......
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