From 5e31b8fc36402b162e2746db0cd9207211e18e6a Mon Sep 17 00:00:00 2001 From: Julian Rex Date: Mon, 25 Nov 2019 17:44:36 -0500 Subject: [PATCH] Integrate Telemetry SDK as framework dependency (#60) --- .gitmodules | 9 - Makefile | 4 - circle.yml | 10 +- platform/darwin/src/MGLOfflineStorage.mm | 2 +- platform/darwin/src/MGLShape.mm | 2 +- platform/darwin/src/MGLShapeOfflineRegion.mm | 2 +- platform/darwin/src/MGLSource.mm | 2 +- .../darwin/src/MGLTilePyramidOfflineRegion.mm | 2 +- platform/ios/CHANGELOG.md | 8 +- .../Mapbox-iOS-SDK-snapshot-dynamic.podspec | 4 +- platform/ios/Mapbox-iOS-SDK-stripped.podspec | 4 +- platform/ios/Mapbox-iOS-SDK.podspec | 3 +- platform/ios/framework/modulemap | 2 +- platform/ios/ios.xcodeproj/project.pbxproj | 486 +++--------------- .../xcshareddata/xcschemes/CI.xcscheme | 71 +-- .../xcshareddata/xcschemes/dynamic.xcscheme | 2 +- .../xcshareddata/xcschemes/iosapp.xcscheme | 15 +- .../ios.xcworkspace/contents.xcworkspacedata | 3 + platform/ios/scripts/check-events-symbols.sh | 37 -- platform/ios/scripts/deploy-packages.sh | 32 +- platform/ios/scripts/package.sh | 96 ++-- platform/ios/scripts/publish.sh | 31 +- platform/ios/src/MGLMapView+Impl.mm | 2 +- platform/ios/src/MGLMapView+OpenGL.mm | 3 +- platform/ios/src/MGLMapView.mm | 2 +- platform/ios/src/MGLMapboxEvents.h | 2 +- platform/ios/src/MGLMapboxEvents.m | 103 ++-- platform/ios/src/Mapbox-Prefix.pch | 1 - platform/ios/vendor/mapbox-events-ios | 2 +- 29 files changed, 295 insertions(+), 647 deletions(-) delete mode 100755 platform/ios/scripts/check-events-symbols.sh delete mode 100644 platform/ios/src/Mapbox-Prefix.pch diff --git a/.gitmodules b/.gitmodules index c740670ef..54b6d3317 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,6 @@ [submodule "platform/ios/vendor/mapbox-events-ios"] path = platform/ios/vendor/mapbox-events-ios url = https://github.com/mapbox/mapbox-events-ios.git -[submodule "vendor/nunicode"] - path = vendor/nunicode - url = https://bitbucket.org/alekseyt/nunicode.git -[submodule "vendor/expected-lite"] - path = vendor/expected - url = https://github.com/martinmoene/expected-lite.git -[submodule "vendor/icu"] - path = vendor/icu - url = https://github.com/unicode-org/icu.git [submodule "platform/darwin/docs/theme"] path = platform/darwin/docs/theme url = https://github.com/mapbox/jazzy-theme.git diff --git a/Makefile b/Makefile index db6262711..fe872b5d1 100644 --- a/Makefile +++ b/Makefile @@ -185,10 +185,6 @@ ios-install-simulators: xcversion simulators --install="iOS 10.3.1" || true xcversion simulators --install="iOS 9.3" || true -.PHONY: ios-check-events-symbols -ios-check-events-symbols: - ./platform/ios/scripts/check-events-symbols.sh - .PHONY: ipackage ipackage: ipackage* ipackage%: diff --git a/circle.yml b/circle.yml index 358e83d93..439581318 100644 --- a/circle.yml +++ b/circle.yml @@ -168,7 +168,7 @@ commands: - run: name: Build ios-test command: make ios-test - no_output_timeout: 5m + no_output_timeout: 20m build-ios-integration-test: steps: - run: @@ -270,9 +270,6 @@ jobs: command: make ios-lint - check-if-this-job-can-be-skipped - build-ios-test - - run: - name: Check symbol namespacing for mapbox-events-ios - command: make ios-check-events-symbols - save-dependencies - collect-xcode-build-logs - upload-xcode-build-logs @@ -294,9 +291,6 @@ jobs: command: make ios-lint - check-if-this-job-can-be-skipped - build-ios-test - - run: - name: Check symbol namespacing for mapbox-events-ios - command: make ios-check-events-symbols - save-dependencies - collect-xcode-build-logs - upload-xcode-build-logs @@ -406,7 +400,7 @@ jobs: - run: name: Build dynamic framework for device and simulator command: make iframework - no_output_timeout: 5m + no_output_timeout: 20m - deploy: name: Upload snapshot build to s3 command: | diff --git a/platform/darwin/src/MGLOfflineStorage.mm b/platform/darwin/src/MGLOfflineStorage.mm index 4de406a45..f6634a739 100644 --- a/platform/darwin/src/MGLOfflineStorage.mm +++ b/platform/darwin/src/MGLOfflineStorage.mm @@ -13,7 +13,7 @@ #import "MGLLoggingConfiguration_Private.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEConstants.h" +#import #import "MGLMapboxEvents.h" #endif diff --git a/platform/darwin/src/MGLShape.mm b/platform/darwin/src/MGLShape.mm index 4ed546a3d..6f525e89e 100644 --- a/platform/darwin/src/MGLShape.mm +++ b/platform/darwin/src/MGLShape.mm @@ -6,7 +6,7 @@ #import "MGLTypes.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEEventsManager.h" +#import #endif #import diff --git a/platform/darwin/src/MGLShapeOfflineRegion.mm b/platform/darwin/src/MGLShapeOfflineRegion.mm index b4f4b5e92..b18599c71 100644 --- a/platform/darwin/src/MGLShapeOfflineRegion.mm +++ b/platform/darwin/src/MGLShapeOfflineRegion.mm @@ -14,7 +14,7 @@ #import "MGLLoggingConfiguration_Private.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEConstants.h" +#import #endif @interface MGLShapeOfflineRegion () diff --git a/platform/darwin/src/MGLSource.mm b/platform/darwin/src/MGLSource.mm index 1d7b46e1c..50236904b 100644 --- a/platform/darwin/src/MGLSource.mm +++ b/platform/darwin/src/MGLSource.mm @@ -4,7 +4,7 @@ #import "NSBundle+MGLAdditions.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEEventsManager.h" +#import #endif #include diff --git a/platform/darwin/src/MGLTilePyramidOfflineRegion.mm b/platform/darwin/src/MGLTilePyramidOfflineRegion.mm index 73fcaa91d..b782cd782 100644 --- a/platform/darwin/src/MGLTilePyramidOfflineRegion.mm +++ b/platform/darwin/src/MGLTilePyramidOfflineRegion.mm @@ -11,7 +11,7 @@ #import "MGLLoggingConfiguration_Private.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEConstants.h" +#import #endif @interface MGLTilePyramidOfflineRegion () diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index fb432c033..aa4befef3 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,7 +2,13 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. -## master +## 5.6.0 + +### Packaging +* Integrates [`MapboxMobileEvents`](https://github.com/mapbox/mapbox-events-ios) as a dependency. ([#60](https://github.com/mapbox/mapbox-gl-native-ios/pull/60)) + - CocoaPods: no change. + - Carthage: as an interim measure, please specify `github "mapbox/mapbox-events-ios" == 0.10.1-alpha` in your Cartfile. + - Manual installation: New Github release artifact (`mapbox-ios-sdk-5.6.0-alpha.1-dynamic-with-events.zip`) contains the `MapboxMobileEvents.framework`; please install this along with `Mapbox.framework` ### Networking and storage * Make network requests for expired resources lower priority than requests for new resources. ([#15950](https://github.com/mapbox/mapbox-gl-native/pull/15950)) diff --git a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec index 74d4d8407..34bbd2cb9 100644 --- a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec +++ b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '5.5.0' + version = '5.6.0-alpha.1' m.name = 'Mapbox-iOS-SDK-snapshot-dynamic' m.version = "#{version}-snapshot" @@ -29,4 +29,6 @@ Pod::Spec.new do |m| m.preserve_path = '**/*.bcsymbolmap' + m.dependency "MapboxMobileEvents", "0.10.1-alpha" + end diff --git a/platform/ios/Mapbox-iOS-SDK-stripped.podspec b/platform/ios/Mapbox-iOS-SDK-stripped.podspec index d8300f88c..7e7b82c41 100644 --- a/platform/ios/Mapbox-iOS-SDK-stripped.podspec +++ b/platform/ios/Mapbox-iOS-SDK-stripped.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '5.5.0' + version = '5.6.0-alpha.1' m.name = 'Mapbox-iOS-SDK-stripped' m.version = "#{version}-stripped" @@ -29,4 +29,6 @@ Pod::Spec.new do |m| m.preserve_path = '**/*.bcsymbolmap' + m.dependency "MapboxMobileEvents", "0.10.1-alpha" + end diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec index 22c449fdb..0d52583e2 100644 --- a/platform/ios/Mapbox-iOS-SDK.podspec +++ b/platform/ios/Mapbox-iOS-SDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '5.5.0' + version = '5.6.0-alpha.1' m.name = 'Mapbox-iOS-SDK' m.version = version @@ -29,4 +29,5 @@ Pod::Spec.new do |m| m.preserve_path = '**/*.bcsymbolmap' + m.dependency "MapboxMobileEvents", "0.10.1-alpha" end diff --git a/platform/ios/framework/modulemap b/platform/ios/framework/modulemap index 122db0c2b..450db0dd6 100644 --- a/platform/ios/framework/modulemap +++ b/platform/ios/framework/modulemap @@ -5,4 +5,4 @@ framework module Mapbox { link "c++" link "sqlite3" link "z" -} +} \ No newline at end of file diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index f65a83ee6..b6ec0e34c 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -221,39 +221,6 @@ 404C26E51D89B877000AA13D /* MGLTileSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 404C26E11D89B877000AA13D /* MGLTileSource.mm */; }; 404C26E71D89C55D000AA13D /* MGLTileSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 404C26E61D89C515000AA13D /* MGLTileSource_Private.h */; }; 404C26E81D89C55D000AA13D /* MGLTileSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 404C26E61D89C515000AA13D /* MGLTileSource_Private.h */; }; - 406E99B91FFEFF1B00D9FFCC /* MMEEventLogReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 406E99B11FFEFED500D9FFCC /* MMEEventLogReportViewController.m */; }; - 406E99BA1FFEFF1B00D9FFCC /* MMEEventLogReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 406E99B11FFEFED500D9FFCC /* MMEEventLogReportViewController.m */; }; - 406E99BB1FFF006C00D9FFCC /* MMEUINavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 406E99B21FFEFED500D9FFCC /* MMEUINavigation.m */; }; - 406E99BC1FFF006D00D9FFCC /* MMEUINavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 406E99B21FFEFED500D9FFCC /* MMEUINavigation.m */; }; - 40834BE71FE05E1800C1BD0D /* MMEAPIClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BA51FE05D6B00C1BD0D /* MMEAPIClient.m */; }; - 40834BE91FE05E1800C1BD0D /* MMECommonEventData.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BCE1FE05D7100C1BD0D /* MMECommonEventData.m */; }; - 40834BEA1FE05E1800C1BD0D /* MMEConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BC01FE05D6E00C1BD0D /* MMEConstants.m */; }; - 40834BEB1FE05E1800C1BD0D /* MMEDependencyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB41FE05D6D00C1BD0D /* MMEDependencyManager.m */; }; - 40834BEC1FE05E1800C1BD0D /* MMEEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BC71FE05D7000C1BD0D /* MMEEvent.m */; }; - 40834BED1FE05E1800C1BD0D /* MMEEventLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB71FE05D6D00C1BD0D /* MMEEventLogger.m */; }; - 40834BEE1FE05E1800C1BD0D /* MMEEventsConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB21FE05D6D00C1BD0D /* MMEEventsConfiguration.m */; }; - 40834BEF1FE05E1800C1BD0D /* MMEEventsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BA41FE05D6B00C1BD0D /* MMEEventsManager.m */; }; - 40834BF01FE05E1800C1BD0D /* MMELocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB81FE05D6D00C1BD0D /* MMELocationManager.m */; }; - 40834BF21FE05E1800C1BD0D /* MMENSURLSessionWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BC61FE05D7000C1BD0D /* MMENSURLSessionWrapper.m */; }; - 40834BF31FE05E1800C1BD0D /* MMETimerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB91FE05D6E00C1BD0D /* MMETimerManager.m */; }; - 40834BF61FE05E1800C1BD0D /* MMEUIApplicationWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BCA1FE05D7000C1BD0D /* MMEUIApplicationWrapper.m */; }; - 40834BF71FE05E1800C1BD0D /* MMEUniqueIdentifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BAD1FE05D6C00C1BD0D /* MMEUniqueIdentifier.m */; }; - 40834BF91FE05E1800C1BD0D /* MMEReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BCD1FE05D7100C1BD0D /* MMEReachability.m */; }; - 40834BFB1FE05E1800C1BD0D /* MMEAPIClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BA51FE05D6B00C1BD0D /* MMEAPIClient.m */; }; - 40834BFD1FE05E1800C1BD0D /* MMECommonEventData.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BCE1FE05D7100C1BD0D /* MMECommonEventData.m */; }; - 40834BFE1FE05E1800C1BD0D /* MMEConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BC01FE05D6E00C1BD0D /* MMEConstants.m */; }; - 40834BFF1FE05E1800C1BD0D /* MMEDependencyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB41FE05D6D00C1BD0D /* MMEDependencyManager.m */; }; - 40834C001FE05E1800C1BD0D /* MMEEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BC71FE05D7000C1BD0D /* MMEEvent.m */; }; - 40834C011FE05E1800C1BD0D /* MMEEventLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB71FE05D6D00C1BD0D /* MMEEventLogger.m */; }; - 40834C021FE05E1800C1BD0D /* MMEEventsConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB21FE05D6D00C1BD0D /* MMEEventsConfiguration.m */; }; - 40834C031FE05E1800C1BD0D /* MMEEventsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BA41FE05D6B00C1BD0D /* MMEEventsManager.m */; }; - 40834C041FE05E1800C1BD0D /* MMELocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB81FE05D6D00C1BD0D /* MMELocationManager.m */; }; - 40834C051FE05E1800C1BD0D /* MMEDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BBC1FE05D6E00C1BD0D /* MMEDate.m */; }; - 40834C061FE05E1800C1BD0D /* MMENSURLSessionWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BC61FE05D7000C1BD0D /* MMENSURLSessionWrapper.m */; }; - 40834C071FE05E1800C1BD0D /* MMETimerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BB91FE05D6E00C1BD0D /* MMETimerManager.m */; }; - 40834C0A1FE05E1800C1BD0D /* MMEUIApplicationWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BCA1FE05D7000C1BD0D /* MMEUIApplicationWrapper.m */; }; - 40834C0B1FE05E1800C1BD0D /* MMEUniqueIdentifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BAD1FE05D6C00C1BD0D /* MMEUniqueIdentifier.m */; }; - 40834C0D1FE05E1800C1BD0D /* MMEReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BCD1FE05D7100C1BD0D /* MMEReachability.m */; }; 4085AF091D933DEA00F11B22 /* MGLTileSetTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4085AF081D933DEA00F11B22 /* MGLTileSetTests.mm */; }; 408AA8571DAEDA1700022900 /* NSDictionary+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 408AA8551DAEDA0800022900 /* NSDictionary+MGLAdditions.h */; }; 408AA8581DAEDA1E00022900 /* NSDictionary+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 408AA8561DAEDA0800022900 /* NSDictionary+MGLAdditions.mm */; }; @@ -286,29 +253,6 @@ 558DE7A31E5615E400C7916D /* MGLFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 558DE79F1E5615E400C7916D /* MGLFoundation.mm */; }; 55CF7531213ED92A00ED86C4 /* libmbgl-vendor-icu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CF7530213ED92A00ED86C4 /* libmbgl-vendor-icu.a */; }; 55E2AD131E5B125400E8C587 /* MGLOfflineStorageTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55E2AD121E5B125400E8C587 /* MGLOfflineStorageTests.mm */; }; - 55E5665121C2A1C20008B8B5 /* MMEReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BCC1FE05D7100C1BD0D /* MMEReachability.h */; }; - 55E5665221C2A2080008B8B5 /* MMENamespacedDependencies.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC81FE05D7000C1BD0D /* MMENamespacedDependencies.h */; }; - 55E5665321C2A2080008B8B5 /* MapboxMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAC1FE05D6C00C1BD0D /* MapboxMobileEvents.h */; }; - 55E5665521C2A2080008B8B5 /* MMEAPIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAB1FE05D6C00C1BD0D /* MMEAPIClient.h */; }; - 55E5665721C2A2080008B8B5 /* MMECommonEventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAE1FE05D6C00C1BD0D /* MMECommonEventData.h */; }; - 55E5665821C2A2080008B8B5 /* MMEConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB01FE05D6C00C1BD0D /* MMEConstants.h */; }; - 55E5665921C2A2080008B8B5 /* MMEDependencyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB11FE05D6D00C1BD0D /* MMEDependencyManager.h */; }; - 55E5665A21C2A2080008B8B5 /* MMEEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBA1FE05D6E00C1BD0D /* MMEEvent.h */; }; - 55E5665B21C2A2080008B8B5 /* MMEEventLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BA61FE05D6B00C1BD0D /* MMEEventLogger.h */; }; - 55E5665C21C2A2080008B8B5 /* MMEEventLogReportViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 406E99B51FFEFED600D9FFCC /* MMEEventLogReportViewController.h */; }; - 55E5665D21C2A2080008B8B5 /* MMEEventsConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBB1FE05D6E00C1BD0D /* MMEEventsConfiguration.h */; }; - 55E5666021C2A2080008B8B5 /* MMEConfigurator.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F4F214066E200537748 /* MMEConfigurator.h */; }; - 55E5666121C2A2080008B8B5 /* MMEEventsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BA31FE05D6B00C1BD0D /* MMEEventsManager.h */; }; - 55E5666221C2A2080008B8B5 /* MMELocationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB31FE05D6D00C1BD0D /* MMELocationManager.h */; }; - 55E5666321C2A2080008B8B5 /* MMEMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = ACD024552187EAAF00D8C8A7 /* MMEMetrics.h */; }; - 55E5666421C2A2080008B8B5 /* MMEMetricsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = ACD024562187EAAF00D8C8A7 /* MMEMetricsManager.h */; }; - 55E5666621C2A2080008B8B5 /* MMENSURLSessionWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAA1FE05D6C00C1BD0D /* MMENSURLSessionWrapper.h */; }; - 55E5666721C2A2080008B8B5 /* MMETimerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC91FE05D7000C1BD0D /* MMETimerManager.h */; }; - 55E5666821C2A2080008B8B5 /* MMETypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB61FE05D6D00C1BD0D /* MMETypes.h */; }; - 55E5666921C2A2080008B8B5 /* MMEUIApplicationWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBE1FE05D6E00C1BD0D /* MMEUIApplicationWrapper.h */; }; - 55E5666A21C2A2080008B8B5 /* MMEUINavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 406E99B31FFEFED600D9FFCC /* MMEUINavigation.h */; }; - 55E5666B21C2A2080008B8B5 /* MMEUniqueIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBF1FE05D6E00C1BD0D /* MMEUniqueIdentifier.h */; }; - 55E5666C21C2A2080008B8B5 /* MMEDispatchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F552140696B00537748 /* MMEDispatchManager.h */; }; 632281DF1E6F855900D75A5D /* MBXEmbeddedMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 632281DE1E6F855900D75A5D /* MBXEmbeddedMapViewController.m */; }; 6407D6701E0085FD00F6A9C3 /* MGLDocumentationExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6407D66F1E0085FD00F6A9C3 /* MGLDocumentationExampleTests.swift */; }; 6F018BAE220031B8003E7269 /* UIView+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAFA29B220023840088709E /* UIView+MGLAdditions.m */; }; @@ -435,82 +379,26 @@ 96E6145C22CC169000109F14 /* MGLCompassButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96E6145822CC169000109F14 /* MGLCompassButton.mm */; }; 96ED34DE22374C0900E9FCA9 /* MGLMapViewDirectionTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 96ED34DD22374C0900E9FCA9 /* MGLMapViewDirectionTests.mm */; }; 96F3F73C1F57124B003E2D2C /* MGLUserLocationHeadingIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 96F3F73B1F5711F1003E2D2C /* MGLUserLocationHeadingIndicator.h */; }; - 9C188C4F2242C95A0022FA55 /* MMEDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 40834BBC1FE05D6E00C1BD0D /* MMEDate.m */; }; - 9C188C502242C96F0022FA55 /* MMEDate.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC51FE05D6F00C1BD0D /* MMEDate.h */; }; - 9C6E281322A97FDC0056B7BE /* MMECategoryLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280922A97FDB0056B7BE /* MMECategoryLoader.m */; }; - 9C6E281422A97FDC0056B7BE /* UIKit+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E280A22A97FDB0056B7BE /* UIKit+MMEMobileEvents.h */; }; - 9C6E281522A97FDC0056B7BE /* CLLocation+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E280B22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.h */; }; - 9C6E281622A97FDC0056B7BE /* NSData+MMEGZIP.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E280C22A97FDB0056B7BE /* NSData+MMEGZIP.h */; }; - 9C6E281722A97FDC0056B7BE /* NSData+MMEGZIP.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280D22A97FDB0056B7BE /* NSData+MMEGZIP.m */; }; - 9C6E281822A97FDC0056B7BE /* CLLocation+MMEMobileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280E22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.m */; }; - 9C6E281922A97FDC0056B7BE /* UIKit+MMEMobileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280F22A97FDB0056B7BE /* UIKit+MMEMobileEvents.m */; }; - 9C6E281A22A97FDC0056B7BE /* CLLocationManager+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E281022A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.h */; }; - 9C6E281B22A97FDC0056B7BE /* MMECategoryLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E281122A97FDB0056B7BE /* MMECategoryLoader.h */; }; - 9C6E281C22A97FDC0056B7BE /* CLLocationManager+MMEMobileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E281222A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.m */; }; - 9C6E281E22A980AC0056B7BE /* CLLocation+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E280B22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.h */; }; - 9C6E281F22A980AC0056B7BE /* CLLocation+MMEMobileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280E22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.m */; }; - 9C6E282022A980AC0056B7BE /* CLLocationManager+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E281022A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.h */; }; - 9C6E282122A980AC0056B7BE /* CLLocationManager+MMEMobileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E281222A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.m */; }; - 9C6E282222A980AC0056B7BE /* MMECategoryLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E281122A97FDB0056B7BE /* MMECategoryLoader.h */; }; - 9C6E282322A980AC0056B7BE /* MMECategoryLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280922A97FDB0056B7BE /* MMECategoryLoader.m */; }; - 9C6E282422A980AC0056B7BE /* NSData+MMEGZIP.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E280C22A97FDB0056B7BE /* NSData+MMEGZIP.h */; }; - 9C6E282522A980AC0056B7BE /* NSData+MMEGZIP.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280D22A97FDB0056B7BE /* NSData+MMEGZIP.m */; }; - 9C6E282622A980AC0056B7BE /* UIKit+MMEMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E280A22A97FDB0056B7BE /* UIKit+MMEMobileEvents.h */; }; - 9C6E282722A980AC0056B7BE /* UIKit+MMEMobileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E280F22A97FDB0056B7BE /* UIKit+MMEMobileEvents.m */; }; - 9C6E282822A980B40056B7BE /* MMEReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BCC1FE05D7100C1BD0D /* MMEReachability.h */; }; 9C6E282B22A981570056B7BE /* MGLMapboxEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E282A22A980E50056B7BE /* MGLMapboxEvents.m */; }; 9C6E282C22A981580056B7BE /* MGLMapboxEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6E282A22A980E50056B7BE /* MGLMapboxEvents.m */; }; 9C6E282D22A9815D0056B7BE /* MGLMapboxEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E282922A980E50056B7BE /* MGLMapboxEvents.h */; }; 9C6E282F22A9824B0056B7BE /* MGLTelemetryConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = AC518DFD201BB55A00EBC820 /* MGLTelemetryConfig.h */; }; 9C6E283022A9824F0056B7BE /* MGLMapboxEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6E282922A980E50056B7BE /* MGLMapboxEvents.h */; }; - 9C6E283122A982530056B7BE /* MapboxMobileEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAC1FE05D6C00C1BD0D /* MapboxMobileEvents.h */; }; - 9C6E283222A982570056B7BE /* MMENamespacedDependencies.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC81FE05D7000C1BD0D /* MMENamespacedDependencies.h */; }; - 9C6E283322A982670056B7BE /* MMEAPIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAB1FE05D6C00C1BD0D /* MMEAPIClient.h */; }; - 9C6E283422A982670056B7BE /* MMECommonEventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAE1FE05D6C00C1BD0D /* MMECommonEventData.h */; }; - 9C6E283522A982670056B7BE /* MMEConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB01FE05D6C00C1BD0D /* MMEConstants.h */; }; - 9C6E283622A982670056B7BE /* MMEDependencyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB11FE05D6D00C1BD0D /* MMEDependencyManager.h */; }; - 9C6E283722A982670056B7BE /* MMEEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBA1FE05D6E00C1BD0D /* MMEEvent.h */; }; - 9C6E283822A982670056B7BE /* MMEEventLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BA61FE05D6B00C1BD0D /* MMEEventLogger.h */; }; - 9C6E283922A982670056B7BE /* MMEEventLogReportViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 406E99B51FFEFED600D9FFCC /* MMEEventLogReportViewController.h */; }; - 9C6E283A22A982670056B7BE /* MMEEventsConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBB1FE05D6E00C1BD0D /* MMEEventsConfiguration.h */; }; - 9C6E283B22A982670056B7BE /* MMEConfigurator.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F4F214066E200537748 /* MMEConfigurator.h */; }; - 9C6E283C22A982670056B7BE /* MMEEventsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BA31FE05D6B00C1BD0D /* MMEEventsManager.h */; }; - 9C6E283D22A982670056B7BE /* MMELocationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB31FE05D6D00C1BD0D /* MMELocationManager.h */; }; - 9C6E283E22A982670056B7BE /* MMEMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = ACD024552187EAAF00D8C8A7 /* MMEMetrics.h */; }; - 9C6E283F22A982670056B7BE /* MMEMetricsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = ACD024562187EAAF00D8C8A7 /* MMEMetricsManager.h */; }; - 9C6E284022A982670056B7BE /* MMEDate.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC51FE05D6F00C1BD0D /* MMEDate.h */; }; - 9C6E284122A982670056B7BE /* MMENSURLSessionWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BAA1FE05D6C00C1BD0D /* MMENSURLSessionWrapper.h */; }; - 9C6E284222A982670056B7BE /* MMETimerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BC91FE05D7000C1BD0D /* MMETimerManager.h */; }; - 9C6E284322A982670056B7BE /* MMETypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BB61FE05D6D00C1BD0D /* MMETypes.h */; }; - 9C6E284422A982670056B7BE /* MMEUIApplicationWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBE1FE05D6E00C1BD0D /* MMEUIApplicationWrapper.h */; }; - 9C6E284522A982670056B7BE /* MMEUINavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 406E99B31FFEFED600D9FFCC /* MMEUINavigation.h */; }; - 9C6E284622A982670056B7BE /* MMEUniqueIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 40834BBF1FE05D6E00C1BD0D /* MMEUniqueIdentifier.h */; }; - 9C6E284722A982670056B7BE /* MMEDispatchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA65F552140696B00537748 /* MMEDispatchManager.h */; }; A4DE3DCB23038C98005B3473 /* MGLMockGestureRecognizers.h in Sources */ = {isa = PBXBuildFile; fileRef = A4DE3DCA23038A7F005B3473 /* MGLMockGestureRecognizers.h */; }; A4DE3DCC23038CCA005B3473 /* MGLMockGestureRecognizers.m in Sources */ = {isa = PBXBuildFile; fileRef = A4DE3DC823038A07005B3473 /* MGLMockGestureRecognizers.m */; }; A4F3FB1D2254865900A30170 /* missing_icon.json in Resources */ = {isa = PBXBuildFile; fileRef = A4F3FB1C2254865900A30170 /* missing_icon.json */; }; - AC46EB59225E600A0039C013 /* MMECertPin.h in Headers */ = {isa = PBXBuildFile; fileRef = AC46EB57225E60090039C013 /* MMECertPin.h */; }; - AC46EB5A225E600A0039C013 /* MMECertPin.h in Headers */ = {isa = PBXBuildFile; fileRef = AC46EB57225E60090039C013 /* MMECertPin.h */; }; - AC46EB5B225E600A0039C013 /* MMECertPin.m in Sources */ = {isa = PBXBuildFile; fileRef = AC46EB58225E60090039C013 /* MMECertPin.m */; }; - AC46EB5C225E600A0039C013 /* MMECertPin.m in Sources */ = {isa = PBXBuildFile; fileRef = AC46EB58225E60090039C013 /* MMECertPin.m */; }; - AC46EB5F225E60510039C013 /* MMEPinningConfigurationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = AC46EB5D225E60510039C013 /* MMEPinningConfigurationProvider.m */; }; - AC46EB60225E60510039C013 /* MMEPinningConfigurationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = AC46EB5D225E60510039C013 /* MMEPinningConfigurationProvider.m */; }; - AC46EB61225E60510039C013 /* MMEPinningConfigurationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = AC46EB5E225E60510039C013 /* MMEPinningConfigurationProvider.h */; }; - AC46EB62225E60510039C013 /* MMEPinningConfigurationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = AC46EB5E225E60510039C013 /* MMEPinningConfigurationProvider.h */; }; AC518DFF201BB55A00EBC820 /* MGLTelemetryConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = AC518DFD201BB55A00EBC820 /* MGLTelemetryConfig.h */; }; AC518E03201BB56000EBC820 /* MGLTelemetryConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = AC518DFE201BB55A00EBC820 /* MGLTelemetryConfig.m */; }; AC518E04201BB56100EBC820 /* MGLTelemetryConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = AC518DFE201BB55A00EBC820 /* MGLTelemetryConfig.m */; }; - ACA65F53214066E600537748 /* MMEConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA65F50214066E600537748 /* MMEConfigurator.m */; }; - ACA65F54214066E600537748 /* MMEConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA65F50214066E600537748 /* MMEConfigurator.m */; }; - ACA65F592140697200537748 /* MMEDispatchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA65F562140697100537748 /* MMEDispatchManager.m */; }; - ACA65F5A2140697200537748 /* MMEDispatchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA65F562140697100537748 /* MMEDispatchManager.m */; }; - ACD0245A2187EABA00D8C8A7 /* MMEMetricsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ACD024542187EAAF00D8C8A7 /* MMEMetricsManager.m */; }; - ACD0245B2187EABA00D8C8A7 /* MMEMetricsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ACD024542187EAAF00D8C8A7 /* MMEMetricsManager.m */; }; - ACD0245E2187EACB00D8C8A7 /* MMEMetrics.m in Sources */ = {isa = PBXBuildFile; fileRef = ACD024572187EAAF00D8C8A7 /* MMEMetrics.m */; }; - ACD0245F2187EACB00D8C8A7 /* MMEMetrics.m in Sources */ = {isa = PBXBuildFile; fileRef = ACD024572187EAAF00D8C8A7 /* MMEMetrics.m */; }; CA0B3C022329DE9A00E4B493 /* MGLTestAssertionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = CAAA65D82321BBA900F08A39 /* MGLTestAssertionHandler.m */; }; CA0C27922076C804001CE5B7 /* MGLShapeSourceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0C27912076C804001CE5B7 /* MGLShapeSourceTests.m */; }; CA0C27942076CA19001CE5B7 /* MGLMapViewIntegrationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0C27932076CA19001CE5B7 /* MGLMapViewIntegrationTest.m */; }; + CA0FAA05237B3BB700C9F3C9 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; + CA0FAA06237B3BB700C9F3C9 /* MapboxMobileEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA96299B23731199004F1330 /* MapboxMobileEvents.framework */; }; + CA0FAA07237B3BC600C9F3C9 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; + CA0FAA08237B3BC600C9F3C9 /* MapboxMobileEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA96299B23731199004F1330 /* MapboxMobileEvents.framework */; }; + CA0FAA09237B3BEA00C9F3C9 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; + CA0FAA0A237B3BEA00C9F3C9 /* MapboxMobileEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA96299B23731199004F1330 /* MapboxMobileEvents.framework */; }; CA1B4A512099FB2200EDD491 /* MGLMapSnapshotterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1B4A502099FB2200EDD491 /* MGLMapSnapshotterTest.m */; }; CA4C54FE2324948100A81659 /* MGLSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA4C54FD2324948100A81659 /* MGLSourceTests.swift */; }; CA4EB8C720863487006AB465 /* MGLStyleLayerIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4EB8C620863487006AB465 /* MGLStyleLayerIntegrationTests.m */; }; @@ -527,11 +415,16 @@ CA86FF0E22D8D5A0009EB14A /* MGLNetworkConfigurationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA86FF0D22D8D5A0009EB14A /* MGLNetworkConfigurationTests.m */; }; CA88DC3021C85D900059ED5A /* MGLStyleURLIntegrationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA88DC2F21C85D900059ED5A /* MGLStyleURLIntegrationTest.m */; }; CA8FBC0921A47BB100D1203C /* MGLRendererConfigurationTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = CA8FBC0821A47BB100D1203C /* MGLRendererConfigurationTests.mm */; }; - CAA69DA4206DCD0E007279CD /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; }; + CA94E5FB237D21030037AEA0 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; + CA94E5FC237D21030037AEA0 /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CA94E5FF237D21030037AEA0 /* MapboxMobileEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA94E5FA237D21030037AEA0 /* MapboxMobileEvents.framework */; }; + CA94E600237D21030037AEA0 /* MapboxMobileEvents.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CA94E5FA237D21030037AEA0 /* MapboxMobileEvents.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CA94E601237EF4110037AEA0 /* MapboxMobileEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA96299B23731199004F1330 /* MapboxMobileEvents.framework */; }; CAA69DA5206DCD0E007279CD /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CAAA65D92321BBA900F08A39 /* MGLTestAssertionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = CAAA65D82321BBA900F08A39 /* MGLTestAssertionHandler.m */; }; + CAB369E5237471D600592F74 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F7839A3235E11FC00D4D606 /* libz.tbd */; }; + CAB36C3B2374D11600592F74 /* libMapboxMobileEvents.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAB36C3A2374D11600592F74 /* libMapboxMobileEvents.a */; }; CABC52C22368CB5100B7E543 /* sideload_sat.db in Resources */ = {isa = PBXBuildFile; fileRef = 1F7839A5235E137000D4D606 /* sideload_sat.db */; }; - CABE5DAD2072FAB40003AF3C /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; CAD9D0AA22A86D6F001B25EE /* MGLResourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = CAD9D0A922A86D6F001B25EE /* MGLResourceTests.mm */; }; CAE7AD5520F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAE7AD5420F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift */; }; CAFB3C14234505D500399265 /* MGLMapSnapshotter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = CAFB3C13234505D500399265 /* MGLMapSnapshotter_Private.h */; }; @@ -559,7 +452,6 @@ DA27C24E1CBB3811000B0ECD /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA27C24D1CBB3811000B0ECD /* GLKit.framework */; }; DA27C24F1CBB4C11000B0ECD /* MGLAccountManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8847FF1CBAFA6200AB86E3 /* MGLAccountManager_Private.h */; }; DA2DBBCE1D51E80400D38FF9 /* MGLStyleLayerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2DBBCD1D51E80400D38FF9 /* MGLStyleLayerTests.m */; }; - DA2E88561CC036F400F24E7B /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; DA2E88611CC0382C00F24E7B /* MGLGeometryTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA2E885C1CC0382C00F24E7B /* MGLGeometryTests.mm */; }; DA2E88621CC0382C00F24E7B /* MGLOfflinePackTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA2E885D1CC0382C00F24E7B /* MGLOfflinePackTests.mm */; }; DA2E88631CC0382C00F24E7B /* MGLOfflineRegionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2E885E1CC0382C00F24E7B /* MGLOfflineRegionTests.m */; }; @@ -602,8 +494,6 @@ DA737EE21D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DA737EE01D056A4E005BDA16 /* MGLMapViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA821D061CCC6D59007508D4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA821D041CCC6D59007508D4 /* LaunchScreen.storyboard */; }; DA821D071CCC6D59007508D4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA821D051CCC6D59007508D4 /* Main.storyboard */; }; - DA8847D91CBAF91600AB86E3 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; - DA8847DA1CBAF91600AB86E3 /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DA8847EF1CBAFA5100AB86E3 /* MGLAccountManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8847DF1CBAFA5100AB86E3 /* MGLAccountManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA8847F01CBAFA5100AB86E3 /* MGLAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8847E01CBAFA5100AB86E3 /* MGLAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA8847F11CBAFA5100AB86E3 /* MGLGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8847E11CBAFA5100AB86E3 /* MGLGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -788,6 +678,13 @@ remoteGlobalIDString = DA8847D11CBAF91600AB86E3; remoteInfo = dynamic; }; + CA94E5FD237D21030037AEA0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DA1DC9421CB6C1C2006E619F /* Project object */; + proxyType = 1; + remoteGlobalIDString = DA8847D11CBAF91600AB86E3; + remoteInfo = dynamic; + }; CABE5DAB2072FA660003AF3C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = DA1DC9421CB6C1C2006E619F /* Project object */; @@ -819,6 +716,18 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + CA0FA9E62379C39C00C9F3C9 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + CA94E600237D21030037AEA0 /* MapboxMobileEvents.framework in Embed Frameworks */, + CA94E5FC237D21030037AEA0 /* Mapbox.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; CAA69DA6206DCD0E007279CD /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -830,17 +739,6 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - DA4A269A1CB6F5D3000B7809 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - DA8847DA1CBAF91600AB86E3 /* Mapbox.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; DAA4E40C1CBB6C9600178DFB /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1023,44 +921,7 @@ 404C26E01D89B877000AA13D /* MGLTileSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLTileSource.h; sourceTree = ""; }; 404C26E11D89B877000AA13D /* MGLTileSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLTileSource.mm; sourceTree = ""; }; 404C26E61D89C515000AA13D /* MGLTileSource_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLTileSource_Private.h; sourceTree = ""; }; - 406E99B11FFEFED500D9FFCC /* MMEEventLogReportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEEventLogReportViewController.m; sourceTree = ""; }; - 406E99B21FFEFED500D9FFCC /* MMEUINavigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEUINavigation.m; sourceTree = ""; }; - 406E99B31FFEFED600D9FFCC /* MMEUINavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEUINavigation.h; sourceTree = ""; }; - 406E99B51FFEFED600D9FFCC /* MMEEventLogReportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEEventLogReportViewController.h; sourceTree = ""; }; 40834AEF1FDF4F0100C1BD0D /* Mapbox-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Mapbox-Prefix.pch"; path = "src/Mapbox-Prefix.pch"; sourceTree = SOURCE_ROOT; }; - 40834BA31FE05D6B00C1BD0D /* MMEEventsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEEventsManager.h; sourceTree = ""; }; - 40834BA41FE05D6B00C1BD0D /* MMEEventsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEEventsManager.m; sourceTree = ""; }; - 40834BA51FE05D6B00C1BD0D /* MMEAPIClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEAPIClient.m; sourceTree = ""; }; - 40834BA61FE05D6B00C1BD0D /* MMEEventLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEEventLogger.h; sourceTree = ""; }; - 40834BAA1FE05D6C00C1BD0D /* MMENSURLSessionWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMENSURLSessionWrapper.h; sourceTree = ""; }; - 40834BAB1FE05D6C00C1BD0D /* MMEAPIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEAPIClient.h; sourceTree = ""; }; - 40834BAC1FE05D6C00C1BD0D /* MapboxMobileEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapboxMobileEvents.h; sourceTree = ""; }; - 40834BAD1FE05D6C00C1BD0D /* MMEUniqueIdentifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEUniqueIdentifier.m; sourceTree = ""; }; - 40834BAE1FE05D6C00C1BD0D /* MMECommonEventData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMECommonEventData.h; sourceTree = ""; }; - 40834BB01FE05D6C00C1BD0D /* MMEConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEConstants.h; sourceTree = ""; }; - 40834BB11FE05D6D00C1BD0D /* MMEDependencyManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEDependencyManager.h; sourceTree = ""; }; - 40834BB21FE05D6D00C1BD0D /* MMEEventsConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEEventsConfiguration.m; sourceTree = ""; }; - 40834BB31FE05D6D00C1BD0D /* MMELocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMELocationManager.h; sourceTree = ""; }; - 40834BB41FE05D6D00C1BD0D /* MMEDependencyManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEDependencyManager.m; sourceTree = ""; }; - 40834BB61FE05D6D00C1BD0D /* MMETypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMETypes.h; sourceTree = ""; }; - 40834BB71FE05D6D00C1BD0D /* MMEEventLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEEventLogger.m; sourceTree = ""; }; - 40834BB81FE05D6D00C1BD0D /* MMELocationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMELocationManager.m; sourceTree = ""; }; - 40834BB91FE05D6E00C1BD0D /* MMETimerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMETimerManager.m; sourceTree = ""; }; - 40834BBA1FE05D6E00C1BD0D /* MMEEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEEvent.h; sourceTree = ""; }; - 40834BBB1FE05D6E00C1BD0D /* MMEEventsConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEEventsConfiguration.h; sourceTree = ""; }; - 40834BBC1FE05D6E00C1BD0D /* MMEDate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEDate.m; sourceTree = ""; }; - 40834BBE1FE05D6E00C1BD0D /* MMEUIApplicationWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEUIApplicationWrapper.h; sourceTree = ""; }; - 40834BBF1FE05D6E00C1BD0D /* MMEUniqueIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEUniqueIdentifier.h; sourceTree = ""; }; - 40834BC01FE05D6E00C1BD0D /* MMEConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEConstants.m; sourceTree = ""; }; - 40834BC51FE05D6F00C1BD0D /* MMEDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEDate.h; sourceTree = ""; }; - 40834BC61FE05D7000C1BD0D /* MMENSURLSessionWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMENSURLSessionWrapper.m; sourceTree = ""; }; - 40834BC71FE05D7000C1BD0D /* MMEEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEEvent.m; sourceTree = ""; }; - 40834BC81FE05D7000C1BD0D /* MMENamespacedDependencies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMENamespacedDependencies.h; sourceTree = ""; }; - 40834BC91FE05D7000C1BD0D /* MMETimerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMETimerManager.h; sourceTree = ""; }; - 40834BCA1FE05D7000C1BD0D /* MMEUIApplicationWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEUIApplicationWrapper.m; sourceTree = ""; }; - 40834BCC1FE05D7100C1BD0D /* MMEReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEReachability.h; sourceTree = ""; }; - 40834BCD1FE05D7100C1BD0D /* MMEReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEReachability.m; sourceTree = ""; }; - 40834BCE1FE05D7100C1BD0D /* MMECommonEventData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMECommonEventData.m; sourceTree = ""; }; 4085AF081D933DEA00F11B22 /* MGLTileSetTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLTileSetTests.mm; path = ../../darwin/test/MGLTileSetTests.mm; sourceTree = ""; }; 408AA8551DAEDA0800022900 /* NSDictionary+MGLAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+MGLAdditions.h"; sourceTree = ""; }; 408AA8561DAEDA0800022900 /* NSDictionary+MGLAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSDictionary+MGLAdditions.mm"; sourceTree = ""; }; @@ -1162,16 +1023,6 @@ 96ED34DD22374C0900E9FCA9 /* MGLMapViewDirectionTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLMapViewDirectionTests.mm; sourceTree = ""; }; 96F017292118FBAE00892778 /* MGLMapView_Experimental.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLMapView_Experimental.h; sourceTree = ""; }; 96F3F73B1F5711F1003E2D2C /* MGLUserLocationHeadingIndicator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLUserLocationHeadingIndicator.h; sourceTree = ""; }; - 9C6E280922A97FDB0056B7BE /* MMECategoryLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMECategoryLoader.m; sourceTree = ""; }; - 9C6E280A22A97FDB0056B7BE /* UIKit+MMEMobileEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIKit+MMEMobileEvents.h"; sourceTree = ""; }; - 9C6E280B22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocation+MMEMobileEvents.h"; sourceTree = ""; }; - 9C6E280C22A97FDB0056B7BE /* NSData+MMEGZIP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+MMEGZIP.h"; sourceTree = ""; }; - 9C6E280D22A97FDB0056B7BE /* NSData+MMEGZIP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+MMEGZIP.m"; sourceTree = ""; }; - 9C6E280E22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CLLocation+MMEMobileEvents.m"; sourceTree = ""; }; - 9C6E280F22A97FDB0056B7BE /* UIKit+MMEMobileEvents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIKit+MMEMobileEvents.m"; sourceTree = ""; }; - 9C6E281022A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocationManager+MMEMobileEvents.h"; sourceTree = ""; }; - 9C6E281122A97FDB0056B7BE /* MMECategoryLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMECategoryLoader.h; sourceTree = ""; }; - 9C6E281222A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CLLocationManager+MMEMobileEvents.m"; sourceTree = ""; }; 9C6E282922A980E50056B7BE /* MGLMapboxEvents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = src/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; }; 9C6E282A22A980E50056B7BE /* MGLMapboxEvents.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MGLMapboxEvents.m; path = src/MGLMapboxEvents.m; sourceTree = SOURCE_ROOT; }; 9C6E284822A984120056B7BE /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../Makefile; sourceTree = ""; }; @@ -1179,36 +1030,24 @@ 9C6E285B22A9849E0056B7BE /* ios-code-coverage.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "ios-code-coverage.sh"; sourceTree = ""; }; 9C6E285C22A9849E0056B7BE /* release-notes-github.md.ejs */ = {isa = PBXFileReference; lastKnownFileType = text; path = "release-notes-github.md.ejs"; sourceTree = ""; }; 9C6E285D22A9849E0056B7BE /* document.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = document.sh; sourceTree = ""; }; - 9C6E285E22A9849E0056B7BE /* check-events-symbols.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "check-events-symbols.sh"; sourceTree = ""; }; 9C6E285F22A9849E0056B7BE /* deploy-packages.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "deploy-packages.sh"; sourceTree = ""; }; 9C6E286022A9849E0056B7BE /* publish.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = publish.sh; sourceTree = ""; }; 9C6E286122A9849E0056B7BE /* validate-framework-zip.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "validate-framework-zip.sh"; sourceTree = ""; }; 9C6E286222A9849E0056B7BE /* metrics.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = metrics.sh; sourceTree = ""; }; 9C6E286322A9849E0056B7BE /* package.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = package.sh; sourceTree = ""; }; - 9C6E286422A9849E0056B7BE /* trigger-external-deploy-steps.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "trigger-external-deploy-steps.sh"; sourceTree = ""; }; 9C6E286522A9849E0056B7BE /* release-notes-jazzy.md.ejs */ = {isa = PBXFileReference; lastKnownFileType = text; path = "release-notes-jazzy.md.ejs"; sourceTree = ""; }; 9C6E286622A9849E0056B7BE /* deploy-snapshot.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "deploy-snapshot.sh"; sourceTree = ""; }; 9C6E286722A9849E0056B7BE /* release-notes.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "release-notes.js"; sourceTree = ""; }; A4DE3DC823038A07005B3473 /* MGLMockGestureRecognizers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLMockGestureRecognizers.m; sourceTree = ""; }; A4DE3DCA23038A7F005B3473 /* MGLMockGestureRecognizers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLMockGestureRecognizers.h; sourceTree = ""; }; A4F3FB1C2254865900A30170 /* missing_icon.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = missing_icon.json; sourceTree = ""; }; - AC46EB57225E60090039C013 /* MMECertPin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMECertPin.h; sourceTree = ""; }; - AC46EB58225E60090039C013 /* MMECertPin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMECertPin.m; sourceTree = ""; }; - AC46EB5D225E60510039C013 /* MMEPinningConfigurationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEPinningConfigurationProvider.m; sourceTree = ""; }; - AC46EB5E225E60510039C013 /* MMEPinningConfigurationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEPinningConfigurationProvider.h; sourceTree = ""; }; AC518DFD201BB55A00EBC820 /* MGLTelemetryConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLTelemetryConfig.h; sourceTree = ""; }; AC518DFE201BB55A00EBC820 /* MGLTelemetryConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLTelemetryConfig.m; sourceTree = ""; }; - ACA65F4F214066E200537748 /* MMEConfigurator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEConfigurator.h; sourceTree = ""; }; - ACA65F50214066E600537748 /* MMEConfigurator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEConfigurator.m; sourceTree = ""; }; - ACA65F552140696B00537748 /* MMEDispatchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEDispatchManager.h; sourceTree = ""; }; - ACA65F562140697100537748 /* MMEDispatchManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEDispatchManager.m; sourceTree = ""; }; - ACD024542187EAAF00D8C8A7 /* MMEMetricsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEMetricsManager.m; sourceTree = ""; }; - ACD024552187EAAF00D8C8A7 /* MMEMetrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEMetrics.h; sourceTree = ""; }; - ACD024562187EAAF00D8C8A7 /* MMEMetricsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEMetricsManager.h; sourceTree = ""; }; - ACD024572187EAAF00D8C8A7 /* MMEMetrics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEMetrics.m; sourceTree = ""; }; CA0C27912076C804001CE5B7 /* MGLShapeSourceTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLShapeSourceTests.m; sourceTree = ""; }; CA0C27932076CA19001CE5B7 /* MGLMapViewIntegrationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLMapViewIntegrationTest.m; sourceTree = ""; wrapsLines = 0; }; CA0C27952076CA50001CE5B7 /* MGLMapViewIntegrationTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLMapViewIntegrationTest.h; sourceTree = ""; }; + CA0FA9BB2375EBE700C9F3C9 /* MapboxMobileEvents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MapboxMobileEvents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CA0FA9BE2375EC3200C9F3C9 /* MapboxMobileEvents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MapboxMobileEvents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CA1B4A502099FB2200EDD491 /* MGLMapSnapshotterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLMapSnapshotterTest.m; sourceTree = ""; }; CA4C54FD2324948100A81659 /* MGLSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MGLSourceTests.swift; sourceTree = ""; }; CA4EB8C620863487006AB465 /* MGLStyleLayerIntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLStyleLayerIntegrationTests.m; sourceTree = ""; }; @@ -1222,8 +1061,14 @@ CA86FF0D22D8D5A0009EB14A /* MGLNetworkConfigurationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLNetworkConfigurationTests.m; sourceTree = ""; }; CA88DC2F21C85D900059ED5A /* MGLStyleURLIntegrationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLStyleURLIntegrationTest.m; sourceTree = ""; }; CA8FBC0821A47BB100D1203C /* MGLRendererConfigurationTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLRendererConfigurationTests.mm; path = ../../darwin/test/MGLRendererConfigurationTests.mm; sourceTree = ""; }; + CA94E5FA237D21030037AEA0 /* MapboxMobileEvents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MapboxMobileEvents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CA96299B23731199004F1330 /* MapboxMobileEvents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MapboxMobileEvents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CAAA65D72321BBA900F08A39 /* MGLTestAssertionHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MGLTestAssertionHandler.h; path = ../../darwin/test/MGLTestAssertionHandler.h; sourceTree = ""; }; CAAA65D82321BBA900F08A39 /* MGLTestAssertionHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MGLTestAssertionHandler.m; path = ../../darwin/test/MGLTestAssertionHandler.m; sourceTree = ""; }; + CAB36C102374763F00592F74 /* libMapboxMobileEvents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libMapboxMobileEvents.a; sourceTree = BUILT_PRODUCTS_DIR; }; + CAB36C382374D10100592F74 /* libMapboxMobileEvents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libMapboxMobileEvents.a; sourceTree = BUILT_PRODUCTS_DIR; }; + CAB36C3A2374D11600592F74 /* libMapboxMobileEvents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libMapboxMobileEvents.a; sourceTree = BUILT_PRODUCTS_DIR; }; + CAB36C3D2374D7DE00592F74 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = ../../build/ios/pkg/static/Mapbox.framework; sourceTree = ""; }; CAD9D0A922A86D6F001B25EE /* MGLResourceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLResourceTests.mm; path = ../../darwin/test/MGLResourceTests.mm; sourceTree = ""; }; CAE7AD5320F46EF5003B6782 /* integration-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "integration-Bridging-Header.h"; sourceTree = ""; }; CAE7AD5420F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MGLMapSnapshotterSwiftTests.swift; sourceTree = ""; }; @@ -1491,7 +1336,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CABE5DAD2072FAB40003AF3C /* Mapbox.framework in Frameworks */, + CA0FAA07237B3BC600C9F3C9 /* Mapbox.framework in Frameworks */, + CA0FAA08237B3BC600C9F3C9 /* MapboxMobileEvents.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1499,7 +1345,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CAA69DA4206DCD0E007279CD /* Mapbox.framework in Frameworks */, + CA0FAA09237B3BEA00C9F3C9 /* Mapbox.framework in Frameworks */, + CA0FAA0A237B3BEA00C9F3C9 /* MapboxMobileEvents.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1507,7 +1354,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DA8847D91CBAF91600AB86E3 /* Mapbox.framework in Frameworks */, + CA94E5FF237D21030037AEA0 /* MapboxMobileEvents.framework in Frameworks */, + CA94E5FB237D21030037AEA0 /* Mapbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1515,11 +1363,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CA0FAA05237B3BB700C9F3C9 /* Mapbox.framework in Frameworks */, + CA0FAA06237B3BB700C9F3C9 /* MapboxMobileEvents.framework in Frameworks */, 1F7839A4235E11FD00D4D606 /* libz.tbd in Frameworks */, 1F78399E235AA1E600D4D606 /* libmbgl-core.a in Frameworks */, 1F78399A235A9F8900D4D606 /* libmbgl-vendor-icu.a in Frameworks */, 1FEB98B3235A99EC00BB1DCF /* libsqlite3.tbd in Frameworks */, - DA2E88561CC036F400F24E7B /* Mapbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1527,10 +1376,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CAB369E5237471D600592F74 /* libz.tbd in Frameworks */, 358B3DBB2359EA0F007BEB26 /* libmbgl-vendor-icu.a in Frameworks */, 35BEB5002359BB9600110752 /* libmbgl-core.a in Frameworks */, 358B3DB92359E4A0007BEB26 /* libsqlite3.tbd in Frameworks */, 96802766226556C5006BA4A1 /* libmbxaccounts.a in Frameworks */, + 35BEB5002359BB9600110752 /* libmbgl-core.a in Frameworks */, + CA94E601237EF4110037AEA0 /* MapboxMobileEvents.framework in Frameworks */, DA27C24E1CBB3811000B0ECD /* GLKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1539,9 +1391,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 55CF7531213ED92A00ED86C4 /* libmbgl-vendor-icu.a in Frameworks */, + CAB36C3B2374D11600592F74 /* libMapboxMobileEvents.a in Frameworks */, DAAE5F8720F046E60089D85B /* libmbgl-core.a in Frameworks */, 9680276422655696006BA4A1 /* libmbxaccounts.a in Frameworks */, + 55CF7531213ED92A00ED86C4 /* libmbgl-vendor-icu.a in Frameworks */, 550570D22296E96E00228ECF /* GLKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1787,73 +1640,6 @@ name = Development; sourceTree = ""; }; - 40834BA21FE05D3100C1BD0D /* Runtime */ = { - isa = PBXGroup; - children = ( - 40834BAC1FE05D6C00C1BD0D /* MapboxMobileEvents.h */, - 40834BC81FE05D7000C1BD0D /* MMENamespacedDependencies.h */, - 40834BAB1FE05D6C00C1BD0D /* MMEAPIClient.h */, - 40834BA51FE05D6B00C1BD0D /* MMEAPIClient.m */, - 40834BAE1FE05D6C00C1BD0D /* MMECommonEventData.h */, - 40834BCE1FE05D7100C1BD0D /* MMECommonEventData.m */, - 40834BB01FE05D6C00C1BD0D /* MMEConstants.h */, - 40834BC01FE05D6E00C1BD0D /* MMEConstants.m */, - 40834BB11FE05D6D00C1BD0D /* MMEDependencyManager.h */, - 40834BB41FE05D6D00C1BD0D /* MMEDependencyManager.m */, - 40834BBA1FE05D6E00C1BD0D /* MMEEvent.h */, - 40834BC71FE05D7000C1BD0D /* MMEEvent.m */, - 40834BA61FE05D6B00C1BD0D /* MMEEventLogger.h */, - 40834BB71FE05D6D00C1BD0D /* MMEEventLogger.m */, - 406E99B51FFEFED600D9FFCC /* MMEEventLogReportViewController.h */, - 406E99B11FFEFED500D9FFCC /* MMEEventLogReportViewController.m */, - 40834BBB1FE05D6E00C1BD0D /* MMEEventsConfiguration.h */, - 40834BB21FE05D6D00C1BD0D /* MMEEventsConfiguration.m */, - ACA65F4F214066E200537748 /* MMEConfigurator.h */, - ACA65F50214066E600537748 /* MMEConfigurator.m */, - 40834BA31FE05D6B00C1BD0D /* MMEEventsManager.h */, - 40834BA41FE05D6B00C1BD0D /* MMEEventsManager.m */, - 40834BB31FE05D6D00C1BD0D /* MMELocationManager.h */, - 40834BB81FE05D6D00C1BD0D /* MMELocationManager.m */, - AC46EB57225E60090039C013 /* MMECertPin.h */, - AC46EB58225E60090039C013 /* MMECertPin.m */, - AC46EB5E225E60510039C013 /* MMEPinningConfigurationProvider.h */, - AC46EB5D225E60510039C013 /* MMEPinningConfigurationProvider.m */, - ACD024552187EAAF00D8C8A7 /* MMEMetrics.h */, - ACD024572187EAAF00D8C8A7 /* MMEMetrics.m */, - ACD024562187EAAF00D8C8A7 /* MMEMetricsManager.h */, - ACD024542187EAAF00D8C8A7 /* MMEMetricsManager.m */, - 40834BC51FE05D6F00C1BD0D /* MMEDate.h */, - 40834BBC1FE05D6E00C1BD0D /* MMEDate.m */, - 40834BAA1FE05D6C00C1BD0D /* MMENSURLSessionWrapper.h */, - 40834BC61FE05D7000C1BD0D /* MMENSURLSessionWrapper.m */, - 40834BC91FE05D7000C1BD0D /* MMETimerManager.h */, - 40834BB91FE05D6E00C1BD0D /* MMETimerManager.m */, - 40834BB61FE05D6D00C1BD0D /* MMETypes.h */, - 40834BBE1FE05D6E00C1BD0D /* MMEUIApplicationWrapper.h */, - 40834BCA1FE05D7000C1BD0D /* MMEUIApplicationWrapper.m */, - 406E99B31FFEFED600D9FFCC /* MMEUINavigation.h */, - 406E99B21FFEFED500D9FFCC /* MMEUINavigation.m */, - 40834BBF1FE05D6E00C1BD0D /* MMEUniqueIdentifier.h */, - 40834BAD1FE05D6C00C1BD0D /* MMEUniqueIdentifier.m */, - ACA65F552140696B00537748 /* MMEDispatchManager.h */, - ACA65F562140697100537748 /* MMEDispatchManager.m */, - 9C6E280822A97F6B0056B7BE /* Categories */, - 40834BCB1FE05D7100C1BD0D /* Reachability */, - ); - name = Runtime; - path = "../vendor/mapbox-events-ios/MapboxMobileEvents"; - sourceTree = ""; - }; - 40834BCB1FE05D7100C1BD0D /* Reachability */ = { - isa = PBXGroup; - children = ( - 40834BCC1FE05D7100C1BD0D /* MMEReachability.h */, - 40834BCD1FE05D7100C1BD0D /* MMEReachability.m */, - ); - name = Reachability; - path = "vendor/mapbox-events-ios/MapboxMobileEvents/Reachability"; - sourceTree = SOURCE_ROOT; - }; 409F43FB1E9E77D10048729D /* Swift Integration */ = { isa = PBXGroup; children = ( @@ -1899,23 +1685,6 @@ name = Accounts; sourceTree = ""; }; - 9C6E280822A97F6B0056B7BE /* Categories */ = { - isa = PBXGroup; - children = ( - 9C6E280B22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.h */, - 9C6E280E22A97FDB0056B7BE /* CLLocation+MMEMobileEvents.m */, - 9C6E281022A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.h */, - 9C6E281222A97FDB0056B7BE /* CLLocationManager+MMEMobileEvents.m */, - 9C6E281122A97FDB0056B7BE /* MMECategoryLoader.h */, - 9C6E280922A97FDB0056B7BE /* MMECategoryLoader.m */, - 9C6E280C22A97FDB0056B7BE /* NSData+MMEGZIP.h */, - 9C6E280D22A97FDB0056B7BE /* NSData+MMEGZIP.m */, - 9C6E280A22A97FDB0056B7BE /* UIKit+MMEMobileEvents.h */, - 9C6E280F22A97FDB0056B7BE /* UIKit+MMEMobileEvents.m */, - ); - path = Categories; - sourceTree = ""; - }; 9C6E285922A9849E0056B7BE /* Scripts */ = { isa = PBXGroup; children = ( @@ -1923,13 +1692,11 @@ 9C6E285B22A9849E0056B7BE /* ios-code-coverage.sh */, 9C6E285C22A9849E0056B7BE /* release-notes-github.md.ejs */, 9C6E285D22A9849E0056B7BE /* document.sh */, - 9C6E285E22A9849E0056B7BE /* check-events-symbols.sh */, 9C6E285F22A9849E0056B7BE /* deploy-packages.sh */, 9C6E286022A9849E0056B7BE /* publish.sh */, 9C6E286122A9849E0056B7BE /* validate-framework-zip.sh */, 9C6E286222A9849E0056B7BE /* metrics.sh */, 9C6E286322A9849E0056B7BE /* package.sh */, - 9C6E286422A9849E0056B7BE /* trigger-external-deploy-steps.sh */, 9C6E286522A9849E0056B7BE /* release-notes-jazzy.md.ejs */, 9C6E286622A9849E0056B7BE /* deploy-snapshot.sh */, 9C6E286722A9849E0056B7BE /* release-notes.js */, @@ -2053,6 +1820,14 @@ DA1DC9921CB6DF24006E619F /* Frameworks */ = { isa = PBXGroup; children = ( + CA94E5FA237D21030037AEA0 /* MapboxMobileEvents.framework */, + CA0FA9BE2375EC3200C9F3C9 /* MapboxMobileEvents.framework */, + CA0FA9BB2375EBE700C9F3C9 /* MapboxMobileEvents.framework */, + CAB36C3D2374D7DE00592F74 /* Mapbox.framework */, + CAB36C3A2374D11600592F74 /* libMapboxMobileEvents.a */, + CAB36C382374D10100592F74 /* libMapboxMobileEvents.a */, + CAB36C102374763F00592F74 /* libMapboxMobileEvents.a */, + CA96299B23731199004F1330 /* MapboxMobileEvents.framework */, 1F7839A3235E11FC00D4D606 /* libz.tbd */, 1F78399F235AA1FD00D4D606 /* libmapbox-base-io.a */, 1F78399D235AA1E600D4D606 /* libmbgl-core.a */, @@ -2460,7 +2235,6 @@ AC518DFE201BB55A00EBC820 /* MGLTelemetryConfig.m */, 9C6E282922A980E50056B7BE /* MGLMapboxEvents.h */, 9C6E282A22A980E50056B7BE /* MGLMapboxEvents.m */, - 40834BA21FE05D3100C1BD0D /* Runtime */, ); name = Telemetry; sourceTree = ""; @@ -2496,7 +2270,6 @@ 07D947531F67488E00E37934 /* MGLComputedShapeSource_Private.h in Headers */, 9654C1261FFC1AB900DB6A19 /* MGLPolyline_Private.h in Headers */, 40F887701D7A1E58008ECB67 /* MGLShapeSource_Private.h in Headers */, - 9C6E281622A97FDC0056B7BE /* NSData+MMEGZIP.h in Headers */, 350098DC1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.h in Headers */, 74CB5ECA219B285000102936 /* MGLLineStyleLayer_Private.h in Headers */, 74CB5ECE219B285000102936 /* MGLRasterStyleLayer_Private.h in Headers */, @@ -2506,7 +2279,6 @@ DA88483B1CBAFB8500AB86E3 /* MGLCalloutView.h in Headers */, 35E0CFE61D3E501500188327 /* MGLStyle_Private.h in Headers */, 3510FFF01D6D9D8C00F413B2 /* NSExpression+MGLAdditions.h in Headers */, - 9C6E281B22A97FDC0056B7BE /* MMECategoryLoader.h in Headers */, 74CB5EBF219B280400102936 /* MGLHeatmapStyleLayer_Private.h in Headers */, 1FC4817D2098CBC0000D09B4 /* NSPredicate+MGLPrivateAdditions.h in Headers */, 1FCCEC3A222607A500302E3B /* MGLSDKMetricsManager_Private.h in Headers */, @@ -2547,7 +2319,6 @@ DD0902AB1DB192A800C5BDCE /* MGLNetworkConfiguration.h in Headers */, 35D3A1E61E9BE7EB002B38EE /* MGLScaleBar.h in Headers */, 0778DD431F67556700A73B34 /* MGLComputedShapeSource.h in Headers */, - 9C188C502242C96F0022FA55 /* MMEDate.h in Headers */, 1FCCEC34222605C400302E3B /* MGLSDKMetricsManager.h in Headers */, 1F6A82A221360F9D00BA5B41 /* MGLLoggingConfiguration.h in Headers */, DA8848311CBAFA6200AB86E3 /* NSString+MGLAdditions.h in Headers */, @@ -2566,11 +2337,9 @@ 9221BAAD2069843A0054BDF4 /* MGLTilePyramidOfflineRegion_Private.h in Headers */, 96F3F73C1F57124B003E2D2C /* MGLUserLocationHeadingIndicator.h in Headers */, 408AA8571DAEDA1700022900 /* NSDictionary+MGLAdditions.h in Headers */, - 9C6E281422A97FDC0056B7BE /* UIKit+MMEMobileEvents.h in Headers */, DA88483F1CBAFB8500AB86E3 /* MGLUserLocation.h in Headers */, 558DE7A01E5615E400C7916D /* MGLFoundation_Private.h in Headers */, 966FCF4C1F3A5C9200F2B6DE /* MGLUserLocationHeadingBeamLayer.h in Headers */, - AC46EB59225E600A0039C013 /* MMECertPin.h in Headers */, DA88483D1CBAFB8500AB86E3 /* MGLMapView+IBAdditions.h in Headers */, DA17BE301CC4BAC300402C41 /* MGLMapView_Private.h in Headers */, DAD165781CF4CDFF001FF4B9 /* MGLShapeCollection.h in Headers */, @@ -2593,7 +2362,6 @@ DA8848221CBAFA6200AB86E3 /* MGLOfflineRegion_Private.h in Headers */, 35136D4C1D4277FC00C20EFD /* MGLSource.h in Headers */, 3566C76C1D4A8DFA008152BC /* MGLRasterTileSource.h in Headers */, - AC46EB61225E60510039C013 /* MMEPinningConfigurationProvider.h in Headers */, DA8847F91CBAFA5100AB86E3 /* MGLPolygon.h in Headers */, 4049C2AC1DB6E05500B3F799 /* MGLPointCollection_Private.h in Headers */, DA8847F81CBAFA5100AB86E3 /* MGLPointAnnotation.h in Headers */, @@ -2633,32 +2401,7 @@ DAD1656E1CF41981001FF4B9 /* MGLFeature_Private.h in Headers */, DA88483C1CBAFB8500AB86E3 /* MGLMapView.h in Headers */, 3EA9363147E77DD29FA06063 /* MGLRendererConfiguration.h in Headers */, - 55E5665121C2A1C20008B8B5 /* MMEReachability.h in Headers */, - 55E5665221C2A2080008B8B5 /* MMENamespacedDependencies.h in Headers */, - 55E5665321C2A2080008B8B5 /* MapboxMobileEvents.h in Headers */, - 55E5665521C2A2080008B8B5 /* MMEAPIClient.h in Headers */, - 55E5665721C2A2080008B8B5 /* MMECommonEventData.h in Headers */, - 55E5665821C2A2080008B8B5 /* MMEConstants.h in Headers */, - 55E5665921C2A2080008B8B5 /* MMEDependencyManager.h in Headers */, - 55E5665A21C2A2080008B8B5 /* MMEEvent.h in Headers */, - 9C6E281522A97FDC0056B7BE /* CLLocation+MMEMobileEvents.h in Headers */, - 55E5665B21C2A2080008B8B5 /* MMEEventLogger.h in Headers */, - 55E5665C21C2A2080008B8B5 /* MMEEventLogReportViewController.h in Headers */, - 55E5665D21C2A2080008B8B5 /* MMEEventsConfiguration.h in Headers */, - 55E5666021C2A2080008B8B5 /* MMEConfigurator.h in Headers */, - 55E5666221C2A2080008B8B5 /* MMELocationManager.h in Headers */, - 55E5666321C2A2080008B8B5 /* MMEMetrics.h in Headers */, - 55E5666421C2A2080008B8B5 /* MMEMetricsManager.h in Headers */, - 55E5666621C2A2080008B8B5 /* MMENSURLSessionWrapper.h in Headers */, 550570C822958FB400228ECF /* MGLMapView+Impl.h in Headers */, - 55E5666721C2A2080008B8B5 /* MMETimerManager.h in Headers */, - 55E5666821C2A2080008B8B5 /* MMETypes.h in Headers */, - 9C6E281A22A97FDC0056B7BE /* CLLocationManager+MMEMobileEvents.h in Headers */, - 55E5666921C2A2080008B8B5 /* MMEUIApplicationWrapper.h in Headers */, - 55E5666A21C2A2080008B8B5 /* MMEUINavigation.h in Headers */, - 55E5666B21C2A2080008B8B5 /* MMEUniqueIdentifier.h in Headers */, - 55E5666C21C2A2080008B8B5 /* MMEDispatchManager.h in Headers */, - 55E5666121C2A2080008B8B5 /* MMEEventsManager.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2680,12 +2423,9 @@ DAED38641D62D0FC00D7640F /* NSURL+MGLAdditions.h in Headers */, DABFB85E1CBE99E500D62B32 /* MGLAnnotation.h in Headers */, DABFB8641CBE99E500D62B32 /* MGLOfflineStorage.h in Headers */, - 9C6E283E22A982670056B7BE /* MMEMetrics.h in Headers */, 96E516E32000552A00A02306 /* MGLAccountManager_Private.h in Headers */, 96E5170420005A6B00A02306 /* SMCalloutView.h in Headers */, - 9C6E282822A980B40056B7BE /* MMEReachability.h in Headers */, 96036A02200565C700510F3D /* NSOrthography+MGLAdditions.h in Headers */, - 9C6E284122A982670056B7BE /* MMENSURLSessionWrapper.h in Headers */, DAD165791CF4CDFF001FF4B9 /* MGLShapeCollection.h in Headers */, 4049C29E1DB6CD6C00B3F799 /* MGLPointCollection.h in Headers */, 3566C7671D4A77BA008152BC /* MGLShapeSource.h in Headers */, @@ -2693,7 +2433,6 @@ 967C864C210A9D3C004DF794 /* UIDevice+MGLAdditions.h in Headers */, 404C26E31D89B877000AA13D /* MGLTileSource.h in Headers */, 96E516F6200059EC00A02306 /* MGLRendererFrontend.h in Headers */, - 9C6E284022A982670056B7BE /* MMEDate.h in Headers */, 071BBB041EE76147001FB02A /* MGLImageSource.h in Headers */, 74CB5EC0219B280400102936 /* MGLHeatmapStyleLayer_Private.h in Headers */, 74CB5ECB219B285000102936 /* MGLLineStyleLayer_Private.h in Headers */, @@ -2703,21 +2442,17 @@ 74CB5ECF219B285000102936 /* MGLRasterStyleLayer_Private.h in Headers */, 35D3A1E71E9BE7EC002B38EE /* MGLScaleBar.h in Headers */, 96E516EF2000594F00A02306 /* NSArray+MGLAdditions.h in Headers */, - AC46EB62225E60510039C013 /* MMEPinningConfigurationProvider.h in Headers */, 96E516F12000596800A02306 /* NSString+MGLAdditions.h in Headers */, 35E0CFE71D3E501500188327 /* MGLStyle_Private.h in Headers */, CA55CD42202C16AA00CE7095 /* MGLCameraChangeReason.h in Headers */, DABFB86D1CBE9A0F00D62B32 /* MGLAnnotationImage.h in Headers */, DABFB8721CBE9A0F00D62B32 /* MGLUserLocation.h in Headers */, 92FC0AED207CEE16007B6B54 /* MGLShapeOfflineRegion_Private.h in Headers */, - 9C6E284222A982670056B7BE /* MMETimerManager.h in Headers */, 1FCCEC35222605C400302E3B /* MGLSDKMetricsManager.h in Headers */, 927FBD001F4DB05500F8BF1F /* MGLMapSnapshotter.h in Headers */, 3566C7721D4A9198008152BC /* MGLSource_Private.h in Headers */, - 9C6E283D22A982670056B7BE /* MMELocationManager.h in Headers */, 353933FF1D3FB7DD003F57D7 /* MGLSymbolStyleLayer.h in Headers */, DAAF722E1DA903C700312FA4 /* MGLStyleValue_Private.h in Headers */, - 9C6E283922A982670056B7BE /* MMEEventLogReportViewController.h in Headers */, 1F6A82A92138871900BA5B41 /* MGLLoggingConfiguration_Private.h in Headers */, DABFB8661CBE99E500D62B32 /* MGLPointAnnotation.h in Headers */, 96E6145A22CC169000109F14 /* MGLCompassButton.h in Headers */, @@ -2733,11 +2468,9 @@ 96E516E62000560B00A02306 /* MGLOfflineRegion_Private.h in Headers */, DAD1656D1CF41981001FF4B9 /* MGLFeature.h in Headers */, 550570C922958FB400228ECF /* MGLMapView+Impl.h in Headers */, - 9C6E284622A982670056B7BE /* MMEUniqueIdentifier.h in Headers */, 5580B45C229570A10091291B /* MGLMapView+OpenGL.h in Headers */, 96E516E72000560B00A02306 /* MGLOfflineStorage_Private.h in Headers */, DA17BE311CC4BDAA00402C41 /* MGLMapView_Private.h in Headers */, - 9C6E284522A982670056B7BE /* MMEUINavigation.h in Headers */, DABFB86C1CBE99E500D62B32 /* MGLTypes.h in Headers */, 96E516F720005A2700A02306 /* MGLAnnotationContainerView.h in Headers */, DABFB8691CBE99E500D62B32 /* MGLShape.h in Headers */, @@ -2745,7 +2478,6 @@ 3510FFEB1D6D9C7A00F413B2 /* NSComparisonPredicate+MGLAdditions.h in Headers */, 35E1A4D91D74336F007AA97F /* MGLValueEvaluator.h in Headers */, DABFB8701CBE9A0F00D62B32 /* MGLMapView+IBAdditions.h in Headers */, - 9C6E283822A982670056B7BE /* MMEEventLogger.h in Headers */, CAFB3C15234505D500399265 /* MGLMapSnapshotter_Private.h in Headers */, 6F018BAF220031BF003E7269 /* UIView+MGLAdditions.h in Headers */, 96E516EA2000560B00A02306 /* MGLAnnotationView_Private.h in Headers */, @@ -2759,12 +2491,9 @@ 35CE61831D4165D9004F2359 /* UIColor+MGLAdditions.h in Headers */, 96E516F32000597100A02306 /* NSDictionary+MGLAdditions.h in Headers */, 1FCAE2A920B88B3800C577DD /* MGLLocationManager_Private.h in Headers */, - 9C6E283422A982670056B7BE /* MMECommonEventData.h in Headers */, - 9C6E281E22A980AC0056B7BE /* CLLocation+MMEMobileEvents.h in Headers */, 96E516F02000595800A02306 /* NSBundle+MGLAdditions.h in Headers */, 96E516F920005A3500A02306 /* MGLFaux3DUserLocationAnnotationView.h in Headers */, 96E516F22000596D00A02306 /* NSException+MGLAdditions.h in Headers */, - 9C6E282222A980AC0056B7BE /* MMECategoryLoader.h in Headers */, 96E516EC2000560B00A02306 /* MGLUserLocationAnnotationView_Private.h in Headers */, 1FC4817F2098CD80000D09B4 /* NSPredicate+MGLPrivateAdditions.h in Headers */, DABFB8671CBE99E500D62B32 /* MGLPolygon.h in Headers */, @@ -2777,15 +2506,12 @@ 35E79F211D41266300957B9E /* MGLStyleLayer_Private.h in Headers */, 350098DD1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.h in Headers */, 74CB5EBE219B280400102936 /* MGLFillStyleLayer_Private.h in Headers */, - 9C6E283122A982530056B7BE /* MapboxMobileEvents.h in Headers */, DABFB8681CBE99E500D62B32 /* MGLPolyline.h in Headers */, 9C6E283022A9824F0056B7BE /* MGLMapboxEvents.h in Headers */, - 9C6E283522A982670056B7BE /* MMEConstants.h in Headers */, 96E516DF200054FB00A02306 /* MGLShape_Private.h in Headers */, DABFB86F1CBE9A0F00D62B32 /* MGLMapView.h in Headers */, DA6408DC1DA4E7D300908C90 /* MGLVectorStyleLayer.h in Headers */, 353933F31D3FB753003F57D7 /* MGLCircleStyleLayer.h in Headers */, - 9C6E284722A982670056B7BE /* MMEDispatchManager.h in Headers */, 558DE7A11E5615E400C7916D /* MGLFoundation_Private.h in Headers */, 96E516F820005A3000A02306 /* MGLCompactCalloutView.h in Headers */, 96E516E22000551900A02306 /* MGLPointCollection_Private.h in Headers */, @@ -2793,11 +2519,9 @@ 30E578181DAA85520050F07E /* UIImage+MGLAdditions.h in Headers */, DA704CC31F65A475004B3F28 /* MGLMapAccessibilityElement.h in Headers */, 40F887711D7A1E59008ECB67 /* MGLShapeSource_Private.h in Headers */, - 9C6E283622A982670056B7BE /* MMEDependencyManager.h in Headers */, DABFB8631CBE99E500D62B32 /* MGLOfflineRegion.h in Headers */, DA35A2B21CCA141D00E826B2 /* MGLCompassDirectionFormatter.h in Headers */, DAF0D8141DFE0EC500B28378 /* MGLVectorTileSource_Private.h in Headers */, - 9C6E283F22A982670056B7BE /* MMEMetricsManager.h in Headers */, 8989B17D201A48EB0081CF59 /* MGLHeatmapStyleLayer.h in Headers */, 74CB5EC6219B282500102936 /* MGLBackgroundStyleLayer_Private.h in Headers */, DABFB8731CBE9A9900D62B32 /* Mapbox.h in Headers */, @@ -2814,35 +2538,24 @@ 4018B1CB1CDC288E00F666AF /* MGLAnnotationView.h in Headers */, DABFB85F1CBE99E500D62B32 /* MGLGeometry.h in Headers */, 1FCAE2A320B872A400C577DD /* MGLLocationManager.h in Headers */, - 9C6E283A22A982670056B7BE /* MMEEventsConfiguration.h in Headers */, 96E516E02000550C00A02306 /* MGLFeature_Private.h in Headers */, - 9C6E284422A982670056B7BE /* MMEUIApplicationWrapper.h in Headers */, - 9C6E283322A982670056B7BE /* MMEAPIClient.h in Headers */, 353933F61D3FB785003F57D7 /* MGLBackgroundStyleLayer.h in Headers */, - 9C6E283222A982570056B7BE /* MMENamespacedDependencies.h in Headers */, - 9C6E282422A980AC0056B7BE /* NSData+MMEGZIP.h in Headers */, DABFB85D1CBE99E500D62B32 /* MGLAccountManager.h in Headers */, 74CB5EB2219B252C00102936 /* MGLStyleLayerManager.h in Headers */, 9221BAB020699F8A0054BDF4 /* MGLTilePyramidOfflineRegion_Private.h in Headers */, 96E516F5200059B100A02306 /* MGLNetworkConfiguration.h in Headers */, 96E516DD200054F200A02306 /* MGLPolygon_Private.h in Headers */, 353933F91D3FB79F003F57D7 /* MGLLineStyleLayer.h in Headers */, - 9C6E282622A980AC0056B7BE /* UIKit+MMEMobileEvents.h in Headers */, 96E516EB2000560B00A02306 /* MGLUserLocation_Private.h in Headers */, - 9C6E282022A980AC0056B7BE /* CLLocationManager+MMEMobileEvents.h in Headers */, 35D13AB81D3D15E300AFB4E0 /* MGLStyleLayer.h in Headers */, 1FCCEC3B222607A500302E3B /* MGLSDKMetricsManager_Private.h in Headers */, 35136D4D1D4277FC00C20EFD /* MGLSource.h in Headers */, DA35A2BC1CCA9A6900E826B2 /* MGLClockDirectionFormatter.h in Headers */, 96E516E82000560B00A02306 /* MGLAnnotationContainerView_Private.h in Headers */, - 9C6E283722A982670056B7BE /* MMEEvent.h in Headers */, 35D13AC41D3D19DD00AFB4E0 /* MGLFillStyleLayer.h in Headers */, - 9C6E284322A982670056B7BE /* MMETypes.h in Headers */, DABFB86E1CBE9A0F00D62B32 /* MGLCalloutView.h in Headers */, 96E516FC20005A4400A02306 /* MGLUserLocationHeadingIndicator.h in Headers */, 1F7454971ECD450D00021D39 /* MGLLight_Private.h in Headers */, - 9C6E283C22A982670056B7BE /* MMEEventsManager.h in Headers */, - 9C6E283B22A982670056B7BE /* MMEConfigurator.h in Headers */, DABFB8601CBE99E500D62B32 /* MGLMapCamera.h in Headers */, DA737EE21D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */, DAF0D8191DFE6B2800B28378 /* MGLAttributionInfo_Private.h in Headers */, @@ -2851,7 +2564,6 @@ 96E516E12000551100A02306 /* MGLMultiPoint_Private.h in Headers */, 3EA934623AD0000B7D99C3FB /* MGLRendererConfiguration.h in Headers */, DACA86272019218600E9693A /* MGLRasterDEMSource.h in Headers */, - AC46EB5A225E600A0039C013 /* MMECertPin.h in Headers */, 9621F2502091020E005B3800 /* NSExpression+MGLAdditions.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2903,12 +2615,13 @@ DA1DC9461CB6C1C2006E619F /* Sources */, DA1DC9471CB6C1C2006E619F /* Frameworks */, DA1DC9481CB6C1C2006E619F /* Resources */, - DA4A269A1CB6F5D3000B7809 /* Embed Frameworks */, 074A7F0B2277BD67001A62D1 /* Insert Mapbox Access Token */, + CA0FA9E62379C39C00C9F3C9 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( + CA94E5FE237D21030037AEA0 /* PBXTargetDependency */, ); name = iosapp; productName = iosapp; @@ -3359,62 +3072,44 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9C188C4F2242C95A0022FA55 /* MMEDate.m in Sources */, 35136D391D42271A00C20EFD /* MGLBackgroundStyleLayer.mm in Sources */, 3510FFEC1D6D9C7A00F413B2 /* NSComparisonPredicate+MGLAdditions.mm in Sources */, DAED38651D62D0FC00D7640F /* NSURL+MGLAdditions.m in Sources */, - 40834BEC1FE05E1800C1BD0D /* MMEEvent.m in Sources */, 9620BB3A1E69FE1700705A1D /* MGLSDKUpdateChecker.mm in Sources */, 354B83981D2E873E005D9406 /* MGLUserLocationAnnotationView.m in Sources */, - 40834BEE1FE05E1800C1BD0D /* MMEEventsConfiguration.m in Sources */, DA88485D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m in Sources */, DAD165701CF41981001FF4B9 /* MGLFeature.mm in Sources */, 30E578191DAA855E0050F07E /* UIImage+MGLAdditions.mm in Sources */, - ACD0245A2187EABA00D8C8A7 /* MMEMetricsManager.m in Sources */, 550570C622958FB400228ECF /* MGLMapView+Impl.mm in Sources */, 40EDA1C11CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */, DA8848541CBAFB9800AB86E3 /* MGLCompactCalloutView.m in Sources */, - 40834BEB1FE05E1800C1BD0D /* MMEDependencyManager.m in Sources */, DA8848251CBAFA6200AB86E3 /* MGLPointAnnotation.mm in Sources */, 5580B45D229570A10091291B /* MGLMapView+OpenGL.mm in Sources */, - 40834BEA1FE05E1800C1BD0D /* MMEConstants.m in Sources */, - AC46EB5F225E60510039C013 /* MMEPinningConfigurationProvider.m in Sources */, 929EFFAB1F56DCD4003A77D5 /* MGLAnnotationView.mm in Sources */, 35136D3C1D42272500C20EFD /* MGLCircleStyleLayer.mm in Sources */, DD9BE4F81EB263C50079A3AF /* UIViewController+MGLAdditions.m in Sources */, 350098DE1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */, DA6408DD1DA4E7D300908C90 /* MGLVectorStyleLayer.mm in Sources */, - 40834BF71FE05E1800C1BD0D /* MMEUniqueIdentifier.m in Sources */, 3566C7681D4A77BA008152BC /* MGLShapeSource.mm in Sources */, 967C864D210A9D3C004DF794 /* UIDevice+MGLAdditions.m in Sources */, - AC46EB5B225E600A0039C013 /* MMECertPin.m in Sources */, 400533021DB0862B0069F638 /* NSArray+MGLAdditions.mm in Sources */, 6F018BAE220031B8003E7269 /* UIView+MGLAdditions.m in Sources */, 96036A03200565C700510F3D /* NSOrthography+MGLAdditions.m in Sources */, - ACA65F592140697200537748 /* MMEDispatchManager.m in Sources */, - 40834BF31FE05E1800C1BD0D /* MMETimerManager.m in Sources */, - 9C6E281822A97FDC0056B7BE /* CLLocation+MMEMobileEvents.m in Sources */, 35136D421D42274500C20EFD /* MGLRasterStyleLayer.mm in Sources */, 3538AA1F1D542239008EC33D /* MGLForegroundStyleLayer.mm in Sources */, - 406E99B91FFEFF1B00D9FFCC /* MMEEventLogReportViewController.m in Sources */, - ACA65F53214066E600537748 /* MMEConfigurator.m in Sources */, - 9C6E281722A97FDC0056B7BE /* NSData+MMEGZIP.m in Sources */, DA00FC901D5EEB0D009AABC8 /* MGLAttributionInfo.mm in Sources */, DA88482D1CBAFA6200AB86E3 /* NSBundle+MGLAdditions.m in Sources */, - 406E99BB1FFF006C00D9FFCC /* MMEUINavigation.m in Sources */, 966FCF541F3C323300F2B6DE /* MGLUserLocationHeadingArrowLayer.m in Sources */, DA88485B1CBAFB9800AB86E3 /* MGLUserLocation.m in Sources */, 927FBD011F4DB05500F8BF1F /* MGLMapSnapshotter.mm in Sources */, 350098BD1D480108004B2AF0 /* MGLVectorTileSource.mm in Sources */, 3566C76E1D4A8DFA008152BC /* MGLRasterTileSource.mm in Sources */, DA88488C1CBB037E00AB86E3 /* SMCalloutView.m in Sources */, - 9C6E281322A97FDC0056B7BE /* MMECategoryLoader.m in Sources */, 35136D4E1D4277FC00C20EFD /* MGLSource.mm in Sources */, 1F06668D1EC64F8E001C16D7 /* MGLLight.mm in Sources */, DA35A2B81CCA9A5D00E826B2 /* MGLClockDirectionFormatter.m in Sources */, DAD1657A1CF4CDFF001FF4B9 /* MGLShapeCollection.mm in Sources */, DAF25719201901E200367EF5 /* MGLHillshadeStyleLayer.mm in Sources */, - 9C6E281922A97FDC0056B7BE /* UIKit+MMEMobileEvents.m in Sources */, 35136D451D42275100C20EFD /* MGLSymbolStyleLayer.mm in Sources */, CF75A91522D85E860058A5C4 /* MGLLoggingConfiguration.mm in Sources */, 35599DED1D46F14E0048254D /* MGLStyleValue.mm in Sources */, @@ -3424,10 +3119,8 @@ 9C6E282B22A981570056B7BE /* MGLMapboxEvents.m in Sources */, 1FCCEC36222605C400302E3B /* MGLSDKMetricsManager.m in Sources */, 96E6145B22CC169000109F14 /* MGLCompassButton.mm in Sources */, - 40834BE71FE05E1800C1BD0D /* MMEAPIClient.m in Sources */, DA8848591CBAFB9800AB86E3 /* MGLMapView.mm in Sources */, DA8848501CBAFB9800AB86E3 /* MGLAnnotationImage.m in Sources */, - 40834BF01FE05E1800C1BD0D /* MMELocationManager.m in Sources */, DA8848281CBAFA6200AB86E3 /* MGLShape.mm in Sources */, DA35A2B31CCA141D00E826B2 /* MGLCompassDirectionFormatter.m in Sources */, DD0902A91DB1929D00C5BDCE /* MGLNetworkConfiguration.m in Sources */, @@ -3439,14 +3132,11 @@ 408AA8581DAEDA1E00022900 /* NSDictionary+MGLAdditions.mm in Sources */, DA35A2A11CC9E95F00E826B2 /* MGLCoordinateFormatter.m in Sources */, 92FC0AEE207CEE16007B6B54 /* MGLShapeOfflineRegion.mm in Sources */, - ACD0245E2187EACB00D8C8A7 /* MMEMetrics.m in Sources */, - 40834BF61FE05E1800C1BD0D /* MMEUIApplicationWrapper.m in Sources */, DA8848291CBAFA6200AB86E3 /* MGLStyle.mm in Sources */, 357FE2DF1E02D2B20068B753 /* NSCoder+MGLAdditions.mm in Sources */, 1FF48589223710BE00F19727 /* MGLAttributedExpression.m in Sources */, DA88481C1CBAFA6200AB86E3 /* MGLGeometry.mm in Sources */, 558DE7A21E5615E400C7916D /* MGLFoundation.mm in Sources */, - 40834BE91FE05E1800C1BD0D /* MMECommonEventData.m in Sources */, 3510FFF21D6D9D8C00F413B2 /* NSExpression+MGLAdditions.mm in Sources */, DA88481F1CBAFA6200AB86E3 /* MGLMultiPoint.mm in Sources */, DA88482B1CBAFA6200AB86E3 /* MGLTypes.m in Sources */, @@ -3457,15 +3147,10 @@ DACA86282019218600E9693A /* MGLRasterDEMSource.mm in Sources */, DA8848261CBAFA6200AB86E3 /* MGLPolygon.mm in Sources */, 35B82BFA1D6C5F8400B1B721 /* NSPredicate+MGLAdditions.mm in Sources */, - 40834BF91FE05E1800C1BD0D /* MMEReachability.m in Sources */, - 40834BF21FE05E1800C1BD0D /* MMENSURLSessionWrapper.m in Sources */, 966FCF4E1F3A5C9200F2B6DE /* MGLUserLocationHeadingBeamLayer.m in Sources */, 8989B17E201A48EB0081CF59 /* MGLHeatmapStyleLayer.mm in Sources */, - 40834BED1FE05E1800C1BD0D /* MMEEventLogger.m in Sources */, 353AFA161D65AB17005A69F4 /* NSDate+MGLAdditions.mm in Sources */, 1FCAE2A420B872A400C577DD /* MGLLocationManager.m in Sources */, - 9C6E281C22A97FDC0056B7BE /* CLLocationManager+MMEMobileEvents.m in Sources */, - 40834BEF1FE05E1800C1BD0D /* MMEEventsManager.m in Sources */, 35D13AC51D3D19DD00AFB4E0 /* MGLFillStyleLayer.mm in Sources */, DA8848241CBAFA6200AB86E3 /* MGLOfflineStorage.mm in Sources */, DA88482A1CBAFA6200AB86E3 /* MGLTilePyramidOfflineRegion.mm in Sources */, @@ -3489,47 +3174,30 @@ 35136D3A1D42271A00C20EFD /* MGLBackgroundStyleLayer.mm in Sources */, 3510FFED1D6D9C7A00F413B2 /* NSComparisonPredicate+MGLAdditions.mm in Sources */, 354B83991D2E873E005D9406 /* MGLUserLocationAnnotationView.m in Sources */, - 40834C001FE05E1800C1BD0D /* MMEEvent.m in Sources */, 9620BB3B1E69FE1700705A1D /* MGLSDKUpdateChecker.mm in Sources */, DAA4E4221CBB730400178DFB /* MGLPointAnnotation.mm in Sources */, - 40834C021FE05E1800C1BD0D /* MMEEventsConfiguration.m in Sources */, DAED38661D62D0FC00D7640F /* NSURL+MGLAdditions.m in Sources */, DAD165711CF41981001FF4B9 /* MGLFeature.mm in Sources */, 30E5781A1DAA855E0050F07E /* UIImage+MGLAdditions.mm in Sources */, - ACD0245B2187EABA00D8C8A7 /* MMEMetricsManager.m in Sources */, 40EDA1C21CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */, 550570C722958FB400228ECF /* MGLMapView+Impl.mm in Sources */, DAA4E4291CBB730400178DFB /* NSBundle+MGLAdditions.m in Sources */, - 40834BFF1FE05E1800C1BD0D /* MMEDependencyManager.m in Sources */, - 40834BFE1FE05E1800C1BD0D /* MMEConstants.m in Sources */, 35136D3D1D42272500C20EFD /* MGLCircleStyleLayer.mm in Sources */, 5580B45E229570A10091291B /* MGLMapView+OpenGL.mm in Sources */, DD9BE4FA1EB263F40079A3AF /* UIViewController+MGLAdditions.m in Sources */, - AC46EB60225E60510039C013 /* MMEPinningConfigurationProvider.m in Sources */, 350098DF1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */, DA6408DE1DA4E7D300908C90 /* MGLVectorStyleLayer.mm in Sources */, 3566C7691D4A77BA008152BC /* MGLShapeSource.mm in Sources */, - 9C6E282722A980AC0056B7BE /* UIKit+MMEMobileEvents.m in Sources */, - 40834C0B1FE05E1800C1BD0D /* MMEUniqueIdentifier.m in Sources */, 400533031DB086490069F638 /* NSArray+MGLAdditions.mm in Sources */, 35136D431D42274500C20EFD /* MGLRasterStyleLayer.mm in Sources */, - 9C6E282322A980AC0056B7BE /* MMECategoryLoader.m in Sources */, 967C864E210A9D3C004DF794 /* UIDevice+MGLAdditions.m in Sources */, 96036A04200565C700510F3D /* NSOrthography+MGLAdditions.m in Sources */, - AC46EB5C225E600A0039C013 /* MMECertPin.m in Sources */, 6F018BB1220031C1003E7269 /* UIView+MGLAdditions.m in Sources */, - 40834C071FE05E1800C1BD0D /* MMETimerManager.m in Sources */, - ACA65F5A2140697200537748 /* MMEDispatchManager.m in Sources */, 3538AA201D542239008EC33D /* MGLForegroundStyleLayer.mm in Sources */, DA00FC911D5EEB0D009AABC8 /* MGLAttributionInfo.mm in Sources */, - 40834C051FE05E1800C1BD0D /* MMEDate.m in Sources */, - 9C6E282122A980AC0056B7BE /* CLLocationManager+MMEMobileEvents.m in Sources */, - 406E99BA1FFEFF1B00D9FFCC /* MMEEventLogReportViewController.m in Sources */, - ACA65F54214066E600537748 /* MMEConfigurator.m in Sources */, DAA4E4201CBB730400178DFB /* MGLOfflinePack.mm in Sources */, 966FCF551F3C323500F2B6DE /* MGLUserLocationHeadingArrowLayer.m in Sources */, DAA4E4331CBB730400178DFB /* MGLUserLocation.m in Sources */, - 406E99BC1FFF006D00D9FFCC /* MMEUINavigation.m in Sources */, 927FBD021F4DB05500F8BF1F /* MGLMapSnapshotter.mm in Sources */, 350098BE1D480108004B2AF0 /* MGLVectorTileSource.mm in Sources */, 3566C76F1D4A8DFA008152BC /* MGLRasterTileSource.mm in Sources */, @@ -3546,16 +3214,12 @@ CF75A91622D85E860058A5C4 /* MGLLoggingConfiguration.mm in Sources */, DAA32CC31E4C6B65006F8D24 /* MGLDistanceFormatter.m in Sources */, DAA4E41D1CBB730400178DFB /* MGLGeometry.mm in Sources */, - 40834BFB1FE05E1800C1BD0D /* MMEAPIClient.m in Sources */, 1FCCEC37222605C400302E3B /* MGLSDKMetricsManager.m in Sources */, 9C6E282C22A981580056B7BE /* MGLMapboxEvents.m in Sources */, DAA4E41F1CBB730400178DFB /* MGLMultiPoint.mm in Sources */, 96E6145C22CC169000109F14 /* MGLCompassButton.mm in Sources */, DD0902AA1DB1929D00C5BDCE /* MGLNetworkConfiguration.m in Sources */, - 40834C041FE05E1800C1BD0D /* MMELocationManager.m in Sources */, - 9C6E281F22A980AC0056B7BE /* CLLocation+MMEMobileEvents.m in Sources */, DA35A2B41CCA141D00E826B2 /* MGLCompassDirectionFormatter.m in Sources */, - 9C6E282522A980AC0056B7BE /* NSData+MMEGZIP.m in Sources */, 35D13ABA1D3D15E300AFB4E0 /* MGLStyleLayer.mm in Sources */, 071BBAFF1EE7613E001FB02A /* MGLImageSource.mm in Sources */, DA35A2CC1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */, @@ -3566,13 +3230,10 @@ 357FE2E01E02D2B20068B753 /* NSCoder+MGLAdditions.mm in Sources */, 92FC0AEF207CEE16007B6B54 /* MGLShapeOfflineRegion.mm in Sources */, DAA4E42D1CBB730400178DFB /* MGLAnnotationImage.m in Sources */, - ACD0245F2187EACB00D8C8A7 /* MMEMetrics.m in Sources */, - 40834C0A1FE05E1800C1BD0D /* MMEUIApplicationWrapper.m in Sources */, 558DE7A31E5615E400C7916D /* MGLFoundation.mm in Sources */, 3510FFF31D6D9D8C00F413B2 /* NSExpression+MGLAdditions.mm in Sources */, DAA4E4321CBB730400178DFB /* MGLMapView.mm in Sources */, 1FF4858A223710BE00F19727 /* MGLAttributedExpression.m in Sources */, - 40834BFD1FE05E1800C1BD0D /* MMECommonEventData.m in Sources */, DAA4E41E1CBB730400178DFB /* MGLMapCamera.mm in Sources */, FA68F14E1E9D656600F9F6C2 /* MGLFillExtrusionStyleLayer.mm in Sources */, 1F7454921ECBB42C00021D39 /* MGLLight.mm in Sources */, @@ -3583,16 +3244,12 @@ DAA4E4341CBB730400178DFB /* MGLFaux3DUserLocationAnnotationView.m in Sources */, DACA86292019218600E9693A /* MGLRasterDEMSource.mm in Sources */, 35B82BFB1D6C5F8400B1B721 /* NSPredicate+MGLAdditions.mm in Sources */, - 40834C0D1FE05E1800C1BD0D /* MMEReachability.m in Sources */, - 40834C061FE05E1800C1BD0D /* MMENSURLSessionWrapper.m in Sources */, 966FCF4F1F3A5C9200F2B6DE /* MGLUserLocationHeadingBeamLayer.m in Sources */, DAA4E4231CBB730400178DFB /* MGLPolygon.mm in Sources */, 8989B17F201A48EB0081CF59 /* MGLHeatmapStyleLayer.mm in Sources */, 353AFA171D65AB17005A69F4 /* NSDate+MGLAdditions.mm in Sources */, - 40834C011FE05E1800C1BD0D /* MMEEventLogger.m in Sources */, 35D13AC61D3D19DD00AFB4E0 /* MGLFillStyleLayer.mm in Sources */, 1FCAE2A520B872A400C577DD /* MGLLocationManager.m in Sources */, - 40834C031FE05E1800C1BD0D /* MMEEventsManager.m in Sources */, DAA4E4211CBB730400178DFB /* MGLOfflineStorage.mm in Sources */, 4049C2A01DB6CD6C00B3F799 /* MGLPointCollection.mm in Sources */, 35136D401D42273000C20EFD /* MGLLineStyleLayer.mm in Sources */, @@ -3628,6 +3285,11 @@ target = DA8847D11CBAF91600AB86E3 /* dynamic */; targetProxy = 165D0CE520005351009A3C66 /* PBXContainerItemProxy */; }; + CA94E5FE237D21030037AEA0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DA8847D11CBAF91600AB86E3 /* dynamic */; + targetProxy = CA94E5FD237D21030037AEA0 /* PBXContainerItemProxy */; + }; CABE5DAC2072FA660003AF3C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 16376B2E1FFDB4B40000563E /* Integration Test Harness */; @@ -4069,7 +3731,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", @@ -4095,6 +3756,7 @@ "$(PROJECT_DIR)/vendor/mapbox-accounts-ios", ); LLVM_LTO = YES; + MGL_EVENTS_STATICALLY_LINKED = NO; OTHER_CFLAGS = "-fvisibility=hidden"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -4104,6 +3766,7 @@ "$(variant_cflags)", "$(geometry_cflags)", "$(geojson_cflags)", + "-fcxx-modules", ); OTHER_LDFLAGS = ( "$(mbgl_core_LINK_LIBRARIES)", @@ -4152,6 +3815,7 @@ "$(variant_cflags)", "$(geometry_cflags)", "$(geojson_cflags)", + "-fcxx-modules", ); OTHER_LDFLAGS = ( "-ObjC", @@ -4546,7 +4210,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch"; HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", @@ -4570,6 +4233,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/vendor/mapbox-accounts-ios", ); + MGL_EVENTS_STATICALLY_LINKED = NO; OTHER_CFLAGS = "-fvisibility=hidden"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -4579,6 +4243,7 @@ "$(variant_cflags)", "$(geometry_cflags)", "$(geojson_cflags)", + "-fcxx-modules", ); OTHER_LDFLAGS = ( "$(mbgl_core_LINK_LIBRARIES)", @@ -4603,7 +4268,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", @@ -4629,6 +4293,7 @@ "$(PROJECT_DIR)/vendor/mapbox-accounts-ios", ); LLVM_LTO = YES; + MGL_EVENTS_STATICALLY_LINKED = NO; OTHER_CFLAGS = "-fvisibility=hidden"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -4638,6 +4303,7 @@ "$(variant_cflags)", "$(geometry_cflags)", "$(geojson_cflags)", + "-fcxx-modules", ); OTHER_LDFLAGS = ( "$(mbgl_core_LINK_LIBRARIES)", @@ -4708,6 +4374,7 @@ "$(variant_cflags)", "$(geometry_cflags)", "$(geojson_cflags)", + "-fcxx-modules", ); OTHER_LDFLAGS = ( "-ObjC", @@ -4757,6 +4424,7 @@ "$(variant_cflags)", "$(geometry_cflags)", "$(geojson_cflags)", + "-fcxx-modules", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index ebe96ef82..25752420a 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -14,23 +14,9 @@ buildForAnalyzing = "YES"> - - - - @@ -54,11 +40,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "NO" language = "en" region = "US" codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "YES" - shouldUseLaunchSchemeArgsEnv = "NO"> + onlyGenerateCoverageForSpecifiedTargets = "YES"> + + + + - - - - - - - - - - - - - - - - - + - + diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme index 4fdd89640..7a6f56f23 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme @@ -87,7 +87,7 @@ - - - - + + - - + + + + + + diff --git a/platform/ios/scripts/check-events-symbols.sh b/platform/ios/scripts/check-events-symbols.sh deleted file mode 100755 index c76d5e269..000000000 --- a/platform/ios/scripts/check-events-symbols.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -set -eu -o pipefail - -function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } -function finish { >&2 echo -en "\033[0m"; } -trap finish EXIT - -find_framework() { - step "Looking for Mapbox.framework…" - echo $( find ./build -name Mapbox | tail -n 1 ) -} - -FRAMEWORK=$(find_framework) - -if [[ -z "${FRAMEWORK}" || ! -f "${FRAMEWORK}" ]]; then - echo "No framework found — building dynamic Mapbox.framework…" - make iframework BUILD_DEVICE=false - FRAMEWORK=$(find_framework) -fi - -echo "Found framework: ${FRAMEWORK}" - -step "Checking for un-namespaced symbols from mapbox-events-ios…" - -# Symbols from mapbox-events-ios are prefixed MME. To avoid duplicate symbol -# warnings when multiple copes of mapbox-events-ios are included in a project, -# the maps SDK prefixes these symbols with MGL_. -SYMBOLS=$( nm "$FRAMEWORK" | grep \$_MME || true ) - -if [ -z "${SYMBOLS}" ]; then - echo "✅ No un-namespaced symbols found." -else - echo "❗️ Found un-namespaced symbols:" - echo "${SYMBOLS}" - exit 1 -fi diff --git a/platform/ios/scripts/deploy-packages.sh b/platform/ios/scripts/deploy-packages.sh index 0c22998a2..1a5b1e758 100755 --- a/platform/ios/scripts/deploy-packages.sh +++ b/platform/ios/scripts/deploy-packages.sh @@ -23,7 +23,7 @@ buildPackageStyle() { style="$2" fi step "Building: make ${package} ${style}" - make ${package} + FORMAT=${style} make ${package} step "Publishing ${package} with ${style}" local file_name="" if [ -z ${style} ] @@ -40,6 +40,8 @@ buildPackageStyle() { --tag "ios-v${PUBLISH_VERSION}" \ --name ${file_name} \ --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null + else + step "CREATED ${file_name} - skipping upload to Github" fi } @@ -66,6 +68,10 @@ if [[ ${GITHUB_RELEASE} = "true" ]]; then GITHUB_RELEASE=true # Assign bool, not just a string fi +if [[ ${GITHUB_RELEASE} = "false" ]]; then + GITHUB_RELEASE=false # Assign bool, not just a string +fi + if [[ -z ${VERSION_TAG} ]]; then step "Determining version number from most recent relevant git tag…" VERSION_TAG=$( git describe --tags --match=ios-v*.*.* --abbrev=0 ) @@ -75,19 +81,27 @@ fi if [[ $( echo ${VERSION_TAG} | grep --invert-match ios-v ) ]]; then echo "Error: ${VERSION_TAG} is not a valid iOS version tag" echo "VERSION_TAG should be in format: ios-vX.X.X-pre.X" - exit 1 + if [[ "${GITHUB_RELEASE}" == true ]]; then + exit 1 + fi fi if github-release info --tag ${VERSION_TAG} | grep --quiet "draft: ✗"; then echo "Error: ${VERSION_TAG} has already been published on GitHub" echo "See: https://github.com/${GITHUB_USER}/${GITHUB_REPO}/releases/tag/${VERSION_TAG}" - exit 1 + if [[ "${GITHUB_RELEASE}" == true ]]; then + exit 1 + fi fi -PUBLISH_VERSION=$( echo ${VERSION_TAG} | sed 's/^ios-v//' ) -git checkout ${VERSION_TAG} - -step "Deploying version ${PUBLISH_VERSION}…" +if [[ "${GITHUB_RELEASE}" == true ]]; then + PUBLISH_VERSION=$( echo ${VERSION_TAG} | sed 's/^ios-v//' ) + git checkout ${VERSION_TAG} + step "Deploying version ${PUBLISH_VERSION}…" +else + PUBLISH_VERSION=${VERSION_TAG} + step "Building packages for version ${PUBLISH_VERSION} (Not deploying to Github)" +fi npm install --ignore-scripts mkdir -p ${BINARY_DIRECTORY} @@ -105,6 +119,10 @@ if [[ "${GITHUB_RELEASE}" == true ]]; then --description "${RELEASE_NOTES}" fi +# Used for binary release on Github - includes events SDK +buildPackageStyle "iframework" "dynamic-with-events" + +# Used for Cocoapods/Carthage buildPackageStyle "iframework" "dynamic" buildPackageStyle "iframework SYMBOLS=NO" "stripped-dynamic" diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index fce4ccba5..de2f75023 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -22,25 +22,30 @@ fi FORMAT=${FORMAT:-dynamic} BUILD_DYNAMIC=true BUILD_STATIC=false +INCLUDE_EVENTS_IN_PACKAGE=false if [[ ${FORMAT} == "static" ]]; then BUILD_STATIC=true BUILD_DYNAMIC=false +elif [[ ${FORMAT} == "dynamic-with-events" ]]; then + INCLUDE_EVENTS_IN_PACKAGE=true +elif [[ ${FORMAT} == "stripped-dynamic" ]]; then + echo "Packaging for stripped-dynamic" elif [[ ${FORMAT} != "dynamic" ]]; then echo "Error: FORMAT must be dynamic or static." exit 1 fi +function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } +function finish { >&2 echo -en "\033[0m"; } +trap finish EXIT + SDK=iphonesimulator if [[ ${BUILD_FOR_DEVICE} == true ]]; then SDK=iphoneos fi IOS_SDK_VERSION=`xcrun --sdk ${SDK} --show-sdk-version` -function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } -function finish { >&2 echo -en "\033[0m"; } -trap finish EXIT - -step "Configuring ${FORMAT} framework for ${SDK} ${IOS_SDK_VERSION} (symbols: ${SYMBOLS}, buildtype: ${BUILDTYPE})" +step "Configuring ${FORMAT} framework for ${SDK} ${IOS_SDK_VERSION} (symbols: ${SYMBOLS}, buildtype: ${BUILDTYPE}, include events:${INCLUDE_EVENTS_IN_PACKAGE})" xcodebuild -version @@ -112,6 +117,37 @@ fi LIBS=(Mapbox.a) + +function copyAndMakeFatFramework { + local NAME=$1 + + step "Copying ${NAME} dynamic framework into place for iOS devices" + cp -r \ + ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework \ + ${OUTPUT}/dynamic/ + + if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM ]]; then + step "Copying ${NAME} dSYM" + cp -r ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM \ + ${OUTPUT}/dynamic/ + if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM ]]; then + step "Merging device and simulator dSYMs…" + lipo \ + ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \ + ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \ + -create -output ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} + lipo -info ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} + fi + fi + + step "Merging ${NAME} simulator dynamic library into device dynamic library…" + lipo \ + ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework/${NAME} \ + ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework/${NAME} \ + -create -output ${OUTPUT}/dynamic/${NAME}.framework/${NAME} | echo +} + + # https://medium.com/@syshen/create-an-ios-universal-framework-148eb130a46c if [[ ${BUILD_FOR_DEVICE} == true ]]; then if [[ ${BUILD_STATIC} == true ]]; then @@ -127,30 +163,13 @@ if [[ ${BUILD_FOR_DEVICE} == true ]]; then fi if [[ ${BUILD_DYNAMIC} == true ]]; then - step "Copying dynamic framework into place for iOS devices" - cp -r \ - ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework \ - ${OUTPUT}/dynamic/ + copyAndMakeFatFramework "${NAME}" - if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM ]]; then - step "Copying dSYM" - cp -r ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM \ - ${OUTPUT}/dynamic/ - if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM ]]; then - step "Merging device and simulator dSYMs…" - lipo \ - ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \ - ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \ - -create -output ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} - lipo -info ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} - fi + if [[ ${INCLUDE_EVENTS_IN_PACKAGE} == true ]]; then + copyAndMakeFatFramework "MapboxMobileEvents" fi - step "Merging simulator dynamic library into device dynamic library…" - lipo \ - ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework/${NAME} \ - ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework/${NAME} \ - -create -output ${OUTPUT}/dynamic/${NAME}.framework/${NAME} | echo + # Bundling mapbox-events-ios fi cp -rv platform/ios/app/Settings.bundle ${OUTPUT} @@ -196,14 +215,25 @@ function validate_dsym { fi } -if [[ ${BUILD_DYNAMIC} == true && ${BUILDTYPE} == Release ]]; then - validate_dsym \ - "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \ - "${OUTPUT}/dynamic/${NAME}.framework/${NAME}" +function removeSimulatorSlice { + local NAME=$1 - step "Removing i386 slice from dSYM" - lipo -remove i386 "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" -o "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" - lipo -info "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" + validate_dsym \ + "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \ + "${OUTPUT}/dynamic/${NAME}.framework/${NAME}" + + step "Removing i386 slice from ${NAME} dSYM" + lipo -remove i386 "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" -o "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" + lipo -info "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" +} + + +if [[ ${BUILD_DYNAMIC} == true && ${BUILDTYPE} == Release ]]; then + removeSimulatorSlice "${NAME}" + + if [[ ${INCLUDE_EVENTS_IN_PACKAGE} == true ]]; then + removeSimulatorSlice MapboxMobileEvents + fi fi if [[ ${BUILD_STATIC} == true ]]; then diff --git a/platform/ios/scripts/publish.sh b/platform/ios/scripts/publish.sh index 2c0d01d3d..58cec47c3 100755 --- a/platform/ios/scripts/publish.sh +++ b/platform/ios/scripts/publish.sh @@ -41,15 +41,19 @@ du -sch pkg/dynamic/* # # upload # +DRYRUN="" +if [[ ${SKIP_S3} ]]; then + DRYRUN="--dryrun" +fi + PROGRESS="" if [ -n "${CI:-}" ]; then PROGRESS="--no-progress" fi +step "Uploading ${ZIP_FILENAME} to s3… ${DRYRUN}" - -step "Uploading ${ZIP_FILENAME} to s3…" -aws s3 cp ${ZIP_FILENAME} s3://mapbox/mapbox-gl-native/ios/builds/ --acl public-read ${PROGRESS} +aws s3 cp ${ZIP_FILENAME} s3://mapbox/mapbox-gl-native/ios/builds/ --acl public-read ${PROGRESS} ${DRYRUN} S3_URL=https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/${ZIP_FILENAME} echo "URL: ${S3_URL}" echo "mapbox-gl-native is currently hardcoded" @@ -62,7 +66,7 @@ if [[ ${PUBLISH_VERSION} =~ "snapshot" ]]; then GENERIC_ZIP_FILENAME="mapbox-ios-sdk-${PUBLISH_VERSION}.zip" aws s3 cp \ s3://mapbox/mapbox-gl-native/ios/builds/${ZIP_FILENAME} \ - s3://mapbox/mapbox-gl-native/ios/builds/${GENERIC_ZIP_FILENAME} --acl public-read ${PROGRESS} + s3://mapbox/mapbox-gl-native/ios/builds/${GENERIC_ZIP_FILENAME} --acl public-read ${PROGRESS} {DRYRUN} fi # @@ -70,13 +74,16 @@ fi # step "Validating local and remote checksums…" -curl --output remote-${ZIP_FILENAME} ${S3_URL} -LOCAL_CHECKSUM=$( shasum -a 256 -b ${ZIP_FILENAME} | cut -d ' ' -f 1 ) -REMOTE_CHECKSUM=$( shasum -a 256 -b remote-${ZIP_FILENAME} | cut -d ' ' -f 1 ) -if [ "${LOCAL_CHECKSUM}" == "${REMOTE_CHECKSUM}" ]; then - echo "Checksums match: ${LOCAL_CHECKSUM}" -else - echo "Checksums did not match: ${LOCAL_CHECKSUM} != ${REMOTE_CHECKSUM}" - exit 1 +if [[ ! ${SKIP_S3} ]]; then + curl --output remote-${ZIP_FILENAME} ${S3_URL} + LOCAL_CHECKSUM=$( shasum -a 256 -b ${ZIP_FILENAME} | cut -d ' ' -f 1 ) + REMOTE_CHECKSUM=$( shasum -a 256 -b remote-${ZIP_FILENAME} | cut -d ' ' -f 1 ) + + if [ "${LOCAL_CHECKSUM}" == "${REMOTE_CHECKSUM}" ]; then + echo "Checksums match: ${LOCAL_CHECKSUM}" + else + echo "Checksums did not match: ${LOCAL_CHECKSUM} != ${REMOTE_CHECKSUM}" + exit 1 + fi fi diff --git a/platform/ios/src/MGLMapView+Impl.mm b/platform/ios/src/MGLMapView+Impl.mm index 0b9ab7569..fbe35ff71 100644 --- a/platform/ios/src/MGLMapView+Impl.mm +++ b/platform/ios/src/MGLMapView+Impl.mm @@ -4,7 +4,7 @@ #import "NSBundle+MGLAdditions.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEEventsManager.h" +#import #endif std::unique_ptr MGLMapViewImpl::Create(MGLMapView* nativeView) { diff --git a/platform/ios/src/MGLMapView+OpenGL.mm b/platform/ios/src/MGLMapView+OpenGL.mm index ad30b608e..934433d4a 100644 --- a/platform/ios/src/MGLMapView+OpenGL.mm +++ b/platform/ios/src/MGLMapView+OpenGL.mm @@ -3,8 +3,7 @@ #import "MGLMapView+OpenGL.h" #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -#import "MMEConstants.h" -#import "MGLMapboxEvents.h" +#import #endif #include diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index a464dc3b0..9b7569efa 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -68,7 +68,7 @@ #import "MGLMapAccessibilityElement.h" #import "MGLLocationManager_Private.h" #import "MGLLoggingConfiguration_Private.h" -#import "MMEConstants.h" +#import #include #include diff --git a/platform/ios/src/MGLMapboxEvents.h b/platform/ios/src/MGLMapboxEvents.h index a7d316cc0..7594b21e5 100644 --- a/platform/ios/src/MGLMapboxEvents.h +++ b/platform/ios/src/MGLMapboxEvents.h @@ -1,5 +1,5 @@ #import -#import "MMEEventsManager.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index 808c3a88b..ec6b2e0dc 100644 --- a/platform/ios/src/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m @@ -1,3 +1,5 @@ +@import Foundation; + #import "MGLMapboxEvents.h" #import "MBXSKUToken.h" #import "NSBundle+MGLAdditions.h" @@ -9,8 +11,6 @@ static NSString * const MGLMapboxMetricsDebugLoggingEnabledKey = @"MGLMapboxMetr static NSString * const MGLMapboxMetricsEnabledSettingShownInAppKey = @"MGLMapboxMetricsEnabledSettingShownInApp"; static NSString * const MGLTelemetryAccessTokenKey = @"MGLTelemetryAccessToken"; static NSString * const MGLTelemetryBaseURLKey = @"MGLTelemetryBaseURL"; -static NSString * const MGLEventsProfileKey = @"MMEEventsProfile"; -static NSString * const MGLVariableGeofenceKey = @"VariableGeofence"; static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios"; @@ -22,6 +22,11 @@ static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios"; @end +// TODO: Move to private/public header +@interface MMEEventsManager (TODO) +@property (nonatomic, getter=isDebugLoggingEnabled) BOOL debugLoggingEnabled; +@end + @implementation MGLMapboxEvents + (void)initialize { @@ -49,9 +54,12 @@ static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios"; if (self) { _eventsManager = MMEEventsManager.sharedManager; _eventsManager.debugLoggingEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:MGLMapboxMetricsDebugLoggingEnabledKey]; - _eventsManager.accountType = [[NSUserDefaults standardUserDefaults] integerForKey:MGLMapboxAccountTypeKey]; - _eventsManager.metricsEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:MGLMapboxMetricsEnabledKey]; - + + // TODO: What happens if the dev sets MGLMapboxAccountTypeKey prior to using the SDK? + // _eventsManager.accountType = [[NSUserDefaults standardUserDefaults] integerForKey:MGLMapboxAccountTypeKey]; + BOOL collectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:MGLMapboxMetricsEnabledKey]; + NSUserDefaults.mme_configuration.mme_isCollectionEnabled = collectionEnabled; + // It is possible for the shared instance of this class to be created because of a call to // +[MGLAccountManager load] early on in the app lifecycle of the host application. // If user default values for access token and base URL are available, they are stored here @@ -83,24 +91,18 @@ static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios"; } - (void)updateNonDisablingConfigurationValues { + self.eventsManager.debugLoggingEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:MGLMapboxMetricsDebugLoggingEnabledKey]; - + // It is possible for the telemetry access token key to have been set yet `userDefaultsDidChange:` // is called before `setupWithAccessToken:` is called. // In that case, setting the access token here will have no effect. In practice, that's fine // because the access token value will be resolved when `setupWithAccessToken:` is called eventually if ([[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:MGLTelemetryAccessTokenKey]) { - self.eventsManager.accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:MGLTelemetryAccessTokenKey]; - } - - // It is possible for the telemetry base URL key to have been set yet `userDefaultsDidChange:` - // is called before setupWithAccessToken: is called. - // In that case, setting the base URL here will have no effect. In practice, that's fine - // because the base URL value will be resolved when `setupWithAccessToken:` is called eventually - if ([[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:MGLTelemetryBaseURLKey]) { - NSURL *baseURL = [NSURL URLWithString:[[NSUserDefaults standardUserDefaults] objectForKey:MGLTelemetryBaseURLKey]]; - self.eventsManager.baseURL = baseURL; + NSString *telemetryAccessToken = [[NSUserDefaults standardUserDefaults] objectForKey:MGLTelemetryAccessTokenKey]; + NSUserDefaults.mme_configuration.mme_accessToken = telemetryAccessToken; } + } - (void)updateDisablingConfigurationValuesWithNotification:(NSNotification *)notification { @@ -108,49 +110,50 @@ static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios"; // cares about have not changed. We guard because the pause and resume method checks CoreLocation's // authorization status and that can drag on the main thread if done too many times (e.g. if the host // app heavily uses the user defaults API and this method is called very frequently) + if ([[notification object] respondsToSelector:@selector(objectForKey:)]) { NSUserDefaults *userDefaults = [notification object]; - - NSInteger accountType = [userDefaults integerForKey:MGLMapboxAccountTypeKey]; - BOOL metricsEnabled = [userDefaults boolForKey:MGLMapboxMetricsEnabledKey]; - - if (accountType != self.eventsManager.accountType || metricsEnabled != self.eventsManager.metricsEnabled) { - self.eventsManager.accountType = accountType; - self.eventsManager.metricsEnabled = metricsEnabled; - + +// //TODO: Account type changed at runtime +// NSInteger accountType = [userDefaults integerForKey:MGLMapboxAccountTypeKey]; +// if (accountType != self.eventsManager.accountType) { +// self.eventsManager.accountType = accountType; +// } + + BOOL oldCollectionEnabled = NSUserDefaults.mme_configuration.mme_isCollectionEnabled; + BOOL collectionEnabled = [userDefaults boolForKey:MGLMapboxMetricsEnabledKey]; + + if (collectionEnabled != oldCollectionEnabled) { + NSUserDefaults.mme_configuration.mme_isCollectionEnabled = collectionEnabled; [self.eventsManager pauseOrResumeMetricsCollectionIfRequired]; } } } + (void)setupWithAccessToken:(NSString *)accessToken { - int64_t delayTime = 0; - - if ([[[NSBundle mainBundle] objectForInfoDictionaryKey:MGLEventsProfileKey] isEqualToString:MGLVariableGeofenceKey]) { - delayTime = 10; - } - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayTime * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSString *semanticVersion = [NSBundle mgl_frameworkInfoDictionary][@"MGLSemanticVersionString"]; - NSString *shortVersion = [NSBundle mgl_frameworkInfoDictionary][@"CFBundleShortVersionString"]; - NSString *sdkVersion = semanticVersion ?: shortVersion; - - // It is possible that an alternative access token was already set on this instance when the class was loaded - // Use it if it exists - NSString *resolvedAccessToken = [MGLMapboxEvents sharedInstance].accessToken ?: accessToken; - - [[[self sharedInstance] eventsManager] initializeWithAccessToken:resolvedAccessToken userAgentBase:MGLAPIClientUserAgentBase hostSDKVersion:sdkVersion]; - - // It is possible that an alternative base URL was set on this instance when the class was loaded - // Use it if it exists - if ([MGLMapboxEvents sharedInstance].baseURL) { - [[MGLMapboxEvents sharedInstance] eventsManager].baseURL = [MGLMapboxEvents sharedInstance].baseURL; - } - [[self sharedInstance] eventsManager].skuId = MBXAccountsSKUIDMapsUser; - - [self flush]; - }); + MGLMapboxEvents *events = [MGLMapboxEvents sharedInstance]; + + // From https://github.com/mapbox/mapbox-events-ios + NSString *semanticVersion = [NSBundle mgl_frameworkInfoDictionary][@"MGLSemanticVersionString"]; + NSString *shortVersion = [NSBundle mgl_frameworkInfoDictionary][@"CFBundleShortVersionString"]; + NSString *sdkVersion = semanticVersion ?: shortVersion; + + MMEEventsManager *eventsManager = MMEEventsManager.sharedManager; + + // It is possible that an alternative access token was already set on this instance when the class was loaded + // Use it if it exists + NSString *resolvedAccessToken = [MGLMapboxEvents sharedInstance].accessToken ?: accessToken; + + [eventsManager initializeWithAccessToken:resolvedAccessToken + userAgentBase:MGLAPIClientUserAgentBase + hostSDKVersion:sdkVersion]; + + eventsManager.skuId = MBXAccountsSKUIDMapsUser; + eventsManager.debugLoggingEnabled = [[NSUserDefaults standardUserDefaults] boolForKey :MGLMapboxMetricsDebugLoggingEnabledKey]; + + + events.eventsManager = eventsManager; } + (void)pushTurnstileEvent { diff --git a/platform/ios/src/Mapbox-Prefix.pch b/platform/ios/src/Mapbox-Prefix.pch deleted file mode 100644 index 675402086..000000000 --- a/platform/ios/src/Mapbox-Prefix.pch +++ /dev/null @@ -1 +0,0 @@ -#import "MMENamespacedDependencies.h" diff --git a/platform/ios/vendor/mapbox-events-ios b/platform/ios/vendor/mapbox-events-ios index 2e6bbd9f3..63f2d7d7c 160000 --- a/platform/ios/vendor/mapbox-events-ios +++ b/platform/ios/vendor/mapbox-events-ios @@ -1 +1 @@ -Subproject commit 2e6bbd9f3c898f33a49e20fb97eca86eeb6351e4 +Subproject commit 63f2d7d7c0143eabe2616f62c6f15ef494cd72bb