From ee790818d804c4dda7bc30fe99ffe464bded2435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Wed, 13 Jun 2018 10:50:46 -0700 Subject: [PATCH] [ios, macos] Look more widely for IBDesignablesAgent The IBDesignablesAgent helper process has been renamed for each platform as of Xcode 10, so cast a wider net when trying to detect it. --- platform/darwin/src/NSProcessInfo+MGLAdditions.m | 8 +------- platform/macos/CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/platform/darwin/src/NSProcessInfo+MGLAdditions.m b/platform/darwin/src/NSProcessInfo+MGLAdditions.m index 293f49538..1b4fcecf5 100644 --- a/platform/darwin/src/NSProcessInfo+MGLAdditions.m +++ b/platform/darwin/src/NSProcessInfo+MGLAdditions.m @@ -1,15 +1,9 @@ #import "NSProcessInfo+MGLAdditions.h" -#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR - static NSString * const MGLIBDesignablesAgentProcessName = @"IBDesignablesAgentCocoaTouch"; -#elif TARGET_OS_MAC - static NSString * const MGLIBDesignablesAgentProcessName = @"IBDesignablesAgent"; -#endif - @implementation NSProcessInfo (MGLAdditions) - (BOOL)mgl_isInterfaceBuilderDesignablesAgent { - return [self.processName isEqualToString:MGLIBDesignablesAgentProcessName]; + return [self.processName hasPrefix:@"IBDesignablesAgent"]; } @end diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index 2a9eb13a8..9f71a9c00 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -5,6 +5,7 @@ ### Packaging * The minimum deployment target for this SDK is now macOS 10.11.0. ([#11776](https://github.com/mapbox/mapbox-gl-native/pull/11776)) +* Fixed an issue where `MGLMapView` produced a designable error in Interface Builder storyboards. ([#12140](https://github.com/mapbox/mapbox-gl-native/pull/12140)) ### Style layers