From 2e429171090d09219c192d195a22d978bb9b8095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Tue, 20 Jun 2017 21:40:42 -0700 Subject: [ios] Made SDK bundle identifier consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The iOS SDK’s bundle identifier is now com.mapbox.MapboxGL, whether in the form of a static or dynamic framework. This is also consistent with the macOS SDK. --- platform/darwin/test/MGLAttributionInfoTests.m | 7 ------- platform/ios/ios.xcodeproj/project.pbxproj | 8 ++++---- platform/macos/src/MGLMapView.mm | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/platform/darwin/test/MGLAttributionInfoTests.m b/platform/darwin/test/MGLAttributionInfoTests.m index 5961b61133..0b35e89b67 100644 --- a/platform/darwin/test/MGLAttributionInfoTests.m +++ b/platform/darwin/test/MGLAttributionInfoTests.m @@ -47,17 +47,10 @@ XCTAssertEqualObjects(infos[3].URL, [NSURL URLWithString:@"https://www.mapbox.com/map-feedback/"]); XCTAssertTrue(infos[3].feedbackLink); NSURL *styleURL = [MGLStyle satelliteStreetsStyleURLWithVersion:99]; -#if TARGET_OS_IPHONE - XCTAssertEqualObjects([infos[3] feedbackURLAtCenterCoordinate:mapbox zoomLevel:14], - [NSURL URLWithString:@"https://www.mapbox.com/feedback/?referrer=com.mapbox.sdk.ios#/77.63680/12.98108/14.00/0.0/0"]); - XCTAssertEqualObjects([infos[3] feedbackURLForStyleURL:styleURL atCenterCoordinate:mapbox zoomLevel:3.14159 direction:90.9 pitch:12.5], - [NSURL URLWithString:@"https://www.mapbox.com/feedback/?referrer=com.mapbox.sdk.ios&owner=mapbox&id=satellite-streets-v99&access_token&map_sdk_version=1.0.0#/77.63680/12.98108/3.14/90.9/13"]); -#else XCTAssertEqualObjects([infos[3] feedbackURLAtCenterCoordinate:mapbox zoomLevel:14], [NSURL URLWithString:@"https://www.mapbox.com/feedback/?referrer=com.mapbox.MapboxGL#/77.63680/12.98108/14.00/0.0/0"]); XCTAssertEqualObjects([infos[3] feedbackURLForStyleURL:styleURL atCenterCoordinate:mapbox zoomLevel:3.14159 direction:90.9 pitch:12.5], [NSURL URLWithString:@"https://www.mapbox.com/feedback/?referrer=com.mapbox.MapboxGL&owner=mapbox&id=satellite-streets-v99&access_token&map_sdk_version=1.0.0#/77.63680/12.98108/3.14/90.9/13"]); -#endif } - (void)testStyle { diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 5c42d4aada..a47f8ea449 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -3839,7 +3839,7 @@ "$(mbgl_core_LINK_LIBRARIES)", "$(mbgl_filesource_LINK_LIBRARIES)", ); - PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.sdk.ios; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; PRODUCT_NAME = Mapbox; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; @@ -3882,7 +3882,7 @@ "$(mbgl_core_LINK_LIBRARIES)", "$(mbgl_filesource_LINK_LIBRARIES)", ); - PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.sdk.ios; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; PRODUCT_NAME = Mapbox; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; @@ -3895,7 +3895,7 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = "framework/Info-static.plist"; - PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.sdk.ios; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; PRODUCT_NAME = Mapbox; SKIP_INSTALL = YES; WRAPPER_EXTENSION = bundle; @@ -3906,7 +3906,7 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = "framework/Info-static.plist"; - PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.sdk.ios; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; PRODUCT_NAME = Mapbox; SKIP_INSTALL = YES; WRAPPER_EXTENSION = bundle; diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 92ba89f72d..d11a343488 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -263,7 +263,7 @@ public: _mbglView = new MGLMapViewImpl(self); // Delete the pre-offline ambient cache at - // ~/Library/Caches/com.mapbox.sdk.ios/cache.db. + // ~/Library/Caches/com.mapbox.MapboxGL/cache.db. NSURL *cachesDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSCachesDirectory inDomain:NSUserDomainMask appropriateForURL:nil -- cgit v1.2.1