From 2d99be2f26ff9441d6bf712883d8e0c81da244b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 13 Sep 2018 00:26:09 -0700 Subject: [ios, macos] Look even more widely for IB designables agent The IBDesignablesAgent helper process has been renamed to IBAgent as of the Xcode 10 GM seed, so cast an even wider net when trying to detect it. --- platform/darwin/src/NSProcessInfo+MGLAdditions.m | 3 ++- platform/macos/CHANGELOG.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/darwin/src/NSProcessInfo+MGLAdditions.m b/platform/darwin/src/NSProcessInfo+MGLAdditions.m index 1b4fcecf55..0c287c030b 100644 --- a/platform/darwin/src/NSProcessInfo+MGLAdditions.m +++ b/platform/darwin/src/NSProcessInfo+MGLAdditions.m @@ -3,7 +3,8 @@ @implementation NSProcessInfo (MGLAdditions) - (BOOL)mgl_isInterfaceBuilderDesignablesAgent { - return [self.processName hasPrefix:@"IBDesignablesAgent"]; + NSString *processName = self.processName; + return [processName hasPrefix:@"IBAgent"] || [processName hasPrefix:@"IBDesignablesAgent"]; } @end diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index 5bb11a5578..fffbf7423b 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -7,6 +7,7 @@ ### Other changes * Fixed bug where completion block passed to `-[MGLMapSnapshotter startWithQueue:completionHandler:]` was not being called in all code paths. ([#12355](https://github.com/mapbox/mapbox-gl-native/pull/12355)) +* Fixed an issue where `MGLMapView` produced a designable error in Interface Builder storyboards in Xcode 10. ([#12883](https://github.com/mapbox/mapbox-gl-native/pull/12883)) # 0.11.0 - September 12, 2018 -- cgit v1.2.1