commit 231270c67d5aa771462245531fa9b2ee7d3d0ae8
author Robert Sayre <sayrer@gmail.com> Fri Apr 19 07:49:00 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 19 07:50:04 2019 -0700
tree 5bb55324c1cf21d465f87444a08fbb67f079cf5d
parent 771c6414ccbe064b3d30ac13be384f1ddc5ec09f

Conditionally use deprecated signature for initWithContentsOfURL

Homebrew's CI is breaking on 10.12 (Sierra), for Bazel 0.24+ due to the signature used for NSDictionary:initWithContentsOfURL introduced in the fix for #7371.

This signature with an error parameter is only available on 10.13+ (High Sierra). Here's Apple's documentation: https://developer.apple.com/documentation/foundation/nsdictionary/1416069-initwithcontentsofurl?language=objc

The Homebrew issue:
https://github.com/Homebrew/homebrew-core/pull/38651

Closes #8068.

PiperOrigin-RevId: 244357959

tools/osx/xcode_locator.m

diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
index 71b0b14..90c00fa 100644
--- a/tools/osx/xcode_locator.m
+++ b/tools/osx/xcode_locator.m
@@ -177,8 +177,16 @@
           url, version, expandedVersion);
 
     NSURL *versionPlistUrl = [url URLByAppendingPathComponent:@"Contents/version.plist"];
-    NSDictionary *versionPlistContents = [[NSDictionary alloc] initWithContentsOfURL:versionPlistUrl
-                                                                               error:nil];
+
+    // macOS 10.13 changed the signature of initWithContentsOfURL,
+    // and deprecated the old one.
+    NSDictionary *versionPlistContents;
+#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_12
+    versionPlistContents = [[NSDictionary alloc] initWithContentsOfURL:versionPlistUrl error:nil];
+#else
+    versionPlistContents = [[NSDictionary alloc] initWithContentsOfURL:versionPlistUrl];
+#endif
+
     NSString *productVersion = [versionPlistContents objectForKey:@"ProductBuildVersion"];
     if (productVersion) {
       expandedVersion = [expandedVersion stringByAppendingFormat:@".%@", productVersion];