Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conditionally use deprecated signature for initWithContentsOfURL #8068

Closed
wants to merge 2 commits into from
+11 −2
Closed

Conditionally use deprecated signature for initWithContentsOfURL #8068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34798f9
Conditionally use deprecated signature for NSDictionary:initWithConte…
sayrer Apr 16, 2019
804e9eb
Fix formatting.
sayrer Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions tools/osx/xcode_locator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,17 @@ static void AddEntryToDictionary(
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];
Expand Down