diff options
-rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 72 | ||||
m--------- | platform/ios/vendor/mapbox-events-ios | 0 | ||||
-rw-r--r-- | src/mbgl/text/language_tag.cpp | 2 |
3 files changed, 73 insertions, 1 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index eab0d85417..ca550ee075 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -382,6 +382,20 @@ CAA69DA4206DCD0E007279CD /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; }; CAA69DA5206DCD0E007279CD /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CABE5DAD2072FAB40003AF3C /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA8847D21CBAF91600AB86E3 /* Mapbox.framework */; }; + CF9FFD2A212C2A730014B4AA /* MMEPersistentStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CF9FFD28212C2A720014B4AA /* MMEPersistentStoreManager.h */; }; + CF9FFD2B212C2A730014B4AA /* MMEPersistentStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CF9FFD28212C2A720014B4AA /* MMEPersistentStoreManager.h */; }; + CF9FFD2C212C2A730014B4AA /* MMEPersistentStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD29212C2A720014B4AA /* MMEPersistentStoreManager.m */; }; + CF9FFD2D212C2A730014B4AA /* MMEPersistentStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD29212C2A720014B4AA /* MMEPersistentStoreManager.m */; }; + CF9FFD30212C2B270014B4AA /* Event.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD2E212C2B270014B4AA /* Event.xcdatamodeld */; }; + CF9FFD31212C2B270014B4AA /* Event.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD2E212C2B270014B4AA /* Event.xcdatamodeld */; }; + CF9FFD3A212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD32212C2BDD0014B4AA /* SummarizedEventEntity+CoreDataClass.m */; }; + CF9FFD3B212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD32212C2BDD0014B4AA /* SummarizedEventEntity+CoreDataClass.m */; }; + CF9FFD3C212C2BDF0014B4AA /* EventEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD33212C2BDE0014B4AA /* EventEntity+CoreDataProperties.m */; }; + CF9FFD3D212C2BDF0014B4AA /* EventEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD33212C2BDE0014B4AA /* EventEntity+CoreDataProperties.m */; }; + CF9FFD3E212C2BDF0014B4AA /* EventEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD36212C2BDE0014B4AA /* EventEntity+CoreDataClass.m */; }; + CF9FFD3F212C2BDF0014B4AA /* EventEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD36212C2BDE0014B4AA /* EventEntity+CoreDataClass.m */; }; + CF9FFD40212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD39212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataProperties.m */; }; + CF9FFD41212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9FFD39212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataProperties.m */; }; DA00FC8E1D5EEB0D009AABC8 /* MGLAttributionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA00FC8F1D5EEB0D009AABC8 /* MGLAttributionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA00FC901D5EEB0D009AABC8 /* MGLAttributionInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */; }; @@ -1023,6 +1037,17 @@ CA55CD3E202C16AA00CE7095 /* MGLCameraChangeReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLCameraChangeReason.h; sourceTree = "<group>"; }; CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MGLTestUtility.h; path = ../../darwin/test/MGLTestUtility.h; sourceTree = "<group>"; }; CA6914B420E67F50002DB0EE /* MGLAnnotationViewIntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MGLAnnotationViewIntegrationTests.m; path = "Annotation Tests/MGLAnnotationViewIntegrationTests.m"; sourceTree = "<group>"; }; + CF9FFD28212C2A720014B4AA /* MMEPersistentStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMEPersistentStoreManager.h; sourceTree = "<group>"; }; + CF9FFD29212C2A720014B4AA /* MMEPersistentStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMEPersistentStoreManager.m; sourceTree = "<group>"; }; + CF9FFD2F212C2B270014B4AA /* Event.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Event.xcdatamodel; sourceTree = "<group>"; }; + CF9FFD32212C2BDD0014B4AA /* SummarizedEventEntity+CoreDataClass.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "SummarizedEventEntity+CoreDataClass.m"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/SummarizedEventEntity+CoreDataClass.m"; sourceTree = "<absolute>"; }; + CF9FFD33212C2BDE0014B4AA /* EventEntity+CoreDataProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "EventEntity+CoreDataProperties.m"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/EventEntity+CoreDataProperties.m"; sourceTree = "<absolute>"; }; + CF9FFD34212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataClass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SummarizedEventEntity+CoreDataClass.h"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/SummarizedEventEntity+CoreDataClass.h"; sourceTree = "<absolute>"; }; + CF9FFD35212C2BDE0014B4AA /* EventEntity+CoreDataProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "EventEntity+CoreDataProperties.h"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/EventEntity+CoreDataProperties.h"; sourceTree = "<absolute>"; }; + CF9FFD36212C2BDE0014B4AA /* EventEntity+CoreDataClass.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "EventEntity+CoreDataClass.m"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/EventEntity+CoreDataClass.m"; sourceTree = "<absolute>"; }; + CF9FFD37212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SummarizedEventEntity+CoreDataProperties.h"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/SummarizedEventEntity+CoreDataProperties.h"; sourceTree = "<absolute>"; }; + CF9FFD38212C2BDE0014B4AA /* EventEntity+CoreDataClass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "EventEntity+CoreDataClass.h"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/EventEntity+CoreDataClass.h"; sourceTree = "<absolute>"; }; + CF9FFD39212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "SummarizedEventEntity+CoreDataProperties.m"; path = "/Users/mao.hc/Code/mapbox-gl-native/platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Storage/SummarizedEventEntity+CoreDataProperties.m"; sourceTree = "<absolute>"; }; DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = "<group>"; }; DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = "<group>"; }; DA0CD58F1CF56F6A00A5F5A5 /* MGLFeatureTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLFeatureTests.mm; path = ../../darwin/test/MGLFeatureTests.mm; sourceTree = "<group>"; }; @@ -1572,6 +1597,7 @@ 40834BA21FE05D3100C1BD0D /* Runtime */ = { isa = PBXGroup; children = ( + CF9FFD27212C2A720014B4AA /* Storage */, 40834BC81FE05D7000C1BD0D /* MMENamespacedDependencies.h */, 40834BAC1FE05D6C00C1BD0D /* MapboxMobileEvents.h */, DA8848481CBAFB9800AB86E3 /* MGLMapboxEvents.h */, @@ -1745,6 +1771,25 @@ name = Annotations; sourceTree = "<group>"; }; + CF9FFD27212C2A720014B4AA /* Storage */ = { + isa = PBXGroup; + children = ( + CF9FFD35212C2BDE0014B4AA /* EventEntity+CoreDataProperties.h */, + CF9FFD33212C2BDE0014B4AA /* EventEntity+CoreDataProperties.m */, + CF9FFD38212C2BDE0014B4AA /* EventEntity+CoreDataClass.h */, + CF9FFD36212C2BDE0014B4AA /* EventEntity+CoreDataClass.m */, + CF9FFD37212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataProperties.h */, + CF9FFD39212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataProperties.m */, + CF9FFD34212C2BDE0014B4AA /* SummarizedEventEntity+CoreDataClass.h */, + CF9FFD32212C2BDD0014B4AA /* SummarizedEventEntity+CoreDataClass.m */, + CF9FFD28212C2A720014B4AA /* MMEPersistentStoreManager.h */, + CF9FFD29212C2A720014B4AA /* MMEPersistentStoreManager.m */, + CF9FFD2E212C2B270014B4AA /* Event.xcdatamodeld */, + ); + name = Storage; + path = "vendor/mapbox-events-ios/MapboxMobileEvents/Storage"; + sourceTree = SOURCE_ROOT; + }; DA1DC9411CB6C1C2006E619F = { isa = PBXGroup; children = ( @@ -2287,6 +2332,7 @@ DAD165781CF4CDFF001FF4B9 /* MGLShapeCollection.h in Headers */, DAED38631D62D0FC00D7640F /* NSURL+MGLAdditions.h in Headers */, DA88481E1CBAFA6200AB86E3 /* MGLMultiPoint_Private.h in Headers */, + CF9FFD2A212C2A730014B4AA /* MMEPersistentStoreManager.h in Headers */, 3566C7661D4A77BA008152BC /* MGLShapeSource.h in Headers */, 35CE61821D4165D9004F2359 /* UIColor+MGLAdditions.h in Headers */, 35B82BF81D6C5F8400B1B721 /* NSPredicate+MGLAdditions.h in Headers */, @@ -2453,6 +2499,7 @@ DABFB85F1CBE99E500D62B32 /* MGLGeometry.h in Headers */, 1FCAE2A320B872A400C577DD /* MGLLocationManager.h in Headers */, 96E516E02000550C00A02306 /* MGLFeature_Private.h in Headers */, + CF9FFD2B212C2A730014B4AA /* MMEPersistentStoreManager.h in Headers */, 353933F61D3FB785003F57D7 /* MGLBackgroundStyleLayer.h in Headers */, DABFB85D1CBE99E500D62B32 /* MGLAccountManager.h in Headers */, 96E516F5200059B100A02306 /* MGLNetworkConfiguration.h in Headers */, @@ -2937,6 +2984,7 @@ files = ( 35136D391D42271A00C20EFD /* MGLBackgroundStyleLayer.mm in Sources */, 3510FFEC1D6D9C7A00F413B2 /* NSComparisonPredicate+MGLAdditions.mm in Sources */, + CF9FFD40212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataProperties.m in Sources */, 40834C431FE05F7500C1BD0D /* TSKSPKIHashCache.m in Sources */, DAED38651D62D0FC00D7640F /* NSURL+MGLAdditions.m in Sources */, 40834BEC1FE05E1800C1BD0D /* MMEEvent.m in Sources */, @@ -2979,6 +3027,7 @@ DA88485B1CBAFB9800AB86E3 /* MGLUserLocation.m in Sources */, 927FBD011F4DB05500F8BF1F /* MGLMapSnapshotter.mm in Sources */, 350098BD1D480108004B2AF0 /* MGLVectorTileSource.mm in Sources */, + CF9FFD2C212C2A730014B4AA /* MMEPersistentStoreManager.m in Sources */, 3566C76E1D4A8DFA008152BC /* MGLRasterTileSource.mm in Sources */, DA88488C1CBB037E00AB86E3 /* SMCalloutView.m in Sources */, 35136D4E1D4277FC00C20EFD /* MGLSource.mm in Sources */, @@ -3003,6 +3052,7 @@ DD0902A91DB1929D00C5BDCE /* MGLNetworkConfiguration.m in Sources */, 35D13AB91D3D15E300AFB4E0 /* MGLStyleLayer.mm in Sources */, ACF969F220CB04E600B23FB7 /* MMEEventsService.m in Sources */, + CF9FFD3E212C2BDF0014B4AA /* EventEntity+CoreDataClass.m in Sources */, 40834C4C1FE05F7500C1BD0D /* TSKTrustKitConfig.m in Sources */, DA35A2CB1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */, 071BBB001EE7613F001FB02A /* MGLImageSource.mm in Sources */, @@ -3013,6 +3063,8 @@ 35305D481D22AA680007D005 /* NSData+MGLAdditions.mm in Sources */, 40834BF61FE05E1800C1BD0D /* MMEUIApplicationWrapper.m in Sources */, DA8848291CBAFA6200AB86E3 /* MGLStyle.mm in Sources */, + CF9FFD30212C2B270014B4AA /* Event.xcdatamodeld in Sources */, + CF9FFD3A212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataClass.m in Sources */, 357FE2DF1E02D2B20068B753 /* NSCoder+MGLAdditions.mm in Sources */, 40834BF81FE05E1800C1BD0D /* NSData+MMEGZIP.m in Sources */, DA88481C1CBAFA6200AB86E3 /* MGLGeometry.mm in Sources */, @@ -3031,6 +3083,7 @@ 35B82BFA1D6C5F8400B1B721 /* NSPredicate+MGLAdditions.mm in Sources */, 40834C401FE05F7500C1BD0D /* configuration_utils.m in Sources */, 40834BF91FE05E1800C1BD0D /* MMEReachability.m in Sources */, + CF9FFD3C212C2BDF0014B4AA /* EventEntity+CoreDataProperties.m in Sources */, 40834BF21FE05E1800C1BD0D /* MMENSURLSessionWrapper.m in Sources */, 40834C471FE05F7500C1BD0D /* TSKReportsRateLimiter.m in Sources */, 966FCF4E1F3A5C9200F2B6DE /* MGLUserLocationHeadingBeamLayer.m in Sources */, @@ -3065,6 +3118,7 @@ files = ( 35136D3A1D42271A00C20EFD /* MGLBackgroundStyleLayer.mm in Sources */, 3510FFED1D6D9C7A00F413B2 /* NSComparisonPredicate+MGLAdditions.mm in Sources */, + CF9FFD41212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataProperties.m in Sources */, 40834C501FE05F7600C1BD0D /* TSKSPKIHashCache.m in Sources */, 354B83991D2E873E005D9406 /* MGLUserLocationAnnotationView.m in Sources */, 40834C001FE05E1800C1BD0D /* MMEEvent.m in Sources */, @@ -3107,6 +3161,7 @@ 350098BE1D480108004B2AF0 /* MGLVectorTileSource.mm in Sources */, 3566C76F1D4A8DFA008152BC /* MGLRasterTileSource.mm in Sources */, DAA4E4351CBB730400178DFB /* SMCalloutView.m in Sources */, + CF9FFD2D212C2A730014B4AA /* MMEPersistentStoreManager.m in Sources */, 35136D4F1D4277FC00C20EFD /* MGLSource.mm in Sources */, DA35A2B91CCA9A5D00E826B2 /* MGLClockDirectionFormatter.m in Sources */, DAD1657B1CF4CDFF001FF4B9 /* MGLShapeCollection.mm in Sources */, @@ -3131,6 +3186,7 @@ DA35A2CC1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */, 40834C591FE05F7600C1BD0D /* TSKTrustKitConfig.m in Sources */, ACF969F320CB04E600B23FB7 /* MMEEventsService.m in Sources */, + CF9FFD3F212C2BDF0014B4AA /* EventEntity+CoreDataClass.m in Sources */, 408AA8591DAEDA1E00022900 /* NSDictionary+MGLAdditions.mm in Sources */, DAA4E4281CBB730400178DFB /* MGLTypes.m in Sources */, DA35A2A21CC9E95F00E826B2 /* MGLCoordinateFormatter.m in Sources */, @@ -3141,6 +3197,8 @@ 40834C0A1FE05E1800C1BD0D /* MMEUIApplicationWrapper.m in Sources */, 558DE7A31E5615E400C7916D /* MGLFoundation.mm in Sources */, 3510FFF31D6D9D8C00F413B2 /* NSExpression+MGLAdditions.mm in Sources */, + CF9FFD31212C2B270014B4AA /* Event.xcdatamodeld in Sources */, + CF9FFD3B212C2BDF0014B4AA /* SummarizedEventEntity+CoreDataClass.m in Sources */, 40834C0C1FE05E1800C1BD0D /* NSData+MMEGZIP.m in Sources */, DAA4E4321CBB730400178DFB /* MGLMapView.mm in Sources */, 40834BFD1FE05E1800C1BD0D /* MMECommonEventData.m in Sources */, @@ -3159,6 +3217,7 @@ 40834C0D1FE05E1800C1BD0D /* MMEReachability.m in Sources */, 40834C061FE05E1800C1BD0D /* MMENSURLSessionWrapper.m in Sources */, 40834C541FE05F7600C1BD0D /* TSKReportsRateLimiter.m in Sources */, + CF9FFD3D212C2BDF0014B4AA /* EventEntity+CoreDataProperties.m in Sources */, DAA4E4311CBB730400178DFB /* MGLMapboxEvents.m in Sources */, 966FCF4F1F3A5C9200F2B6DE /* MGLUserLocationHeadingBeamLayer.m in Sources */, DAA4E4231CBB730400178DFB /* MGLPolygon.mm in Sources */, @@ -4026,6 +4085,19 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCVersionGroup section */ + CF9FFD2E212C2B270014B4AA /* Event.xcdatamodeld */ = { + isa = XCVersionGroup; + children = ( + CF9FFD2F212C2B270014B4AA /* Event.xcdatamodel */, + ); + currentVersion = CF9FFD2F212C2B270014B4AA /* Event.xcdatamodel */; + path = Event.xcdatamodeld; + sourceTree = "<group>"; + versionGroupType = wrapper.xcdatamodel; + }; +/* End XCVersionGroup section */ }; rootObject = DA1DC9421CB6C1C2006E619F /* Project object */; } diff --git a/platform/ios/vendor/mapbox-events-ios b/platform/ios/vendor/mapbox-events-ios -Subproject 7a74b459d7cd868c7186e9e3f07079390c9269d +Subproject 9d8365e06cc3f2f234738938ec1a71dfe723532 diff --git a/src/mbgl/text/language_tag.cpp b/src/mbgl/text/language_tag.cpp index 4c2712f103..840dc8f6f1 100644 --- a/src/mbgl/text/language_tag.cpp +++ b/src/mbgl/text/language_tag.cpp @@ -6,7 +6,7 @@ #pragma GCC diagnostic ignored "-Wshadow" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wshorten-64-to-32" -#pragma clang diagnostic ignored "-Wtautological-constant-compare" +//#pragma clang diagnostic ignored "-Wtautological-constant-compare" #include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/phoenix_core.hpp> #include <boost/spirit/include/phoenix_operator.hpp> |