summaryrefslogtreecommitdiff
path: root/platform/ios/ios.xcodeproj/project.pbxproj
diff options
context:
space:
mode:
Diffstat (limited to 'platform/ios/ios.xcodeproj/project.pbxproj')
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj62
1 files changed, 46 insertions, 16 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 160d82bcf9..ab6ac6cb17 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -149,6 +149,11 @@
357FE2DE1E02D2B20068B753 /* NSCoder+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 357FE2DB1E02D2B20068B753 /* NSCoder+MGLAdditions.h */; };
357FE2DF1E02D2B20068B753 /* NSCoder+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 357FE2DC1E02D2B20068B753 /* NSCoder+MGLAdditions.mm */; };
357FE2E01E02D2B20068B753 /* NSCoder+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 357FE2DC1E02D2B20068B753 /* NSCoder+MGLAdditions.mm */; };
+ 358DDF8821AEC37C0029FCBB /* OverflowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358DDF8721AEC37C0029FCBB /* OverflowViewController.swift */; };
+ 358DDF8A21AEC4330029FCBB /* route.json in Resources */ = {isa = PBXBuildFile; fileRef = 358DDF8921AEC4330029FCBB /* route.json */; };
+ 358DDF8C21AEE5A20029FCBB /* route.json in Resources */ = {isa = PBXBuildFile; fileRef = 358DDF8B21AEE5A10029FCBB /* route.json */; };
+ 358DDF8E21AEE86F0029FCBB /* one-liner.json in Resources */ = {isa = PBXBuildFile; fileRef = 358DDF8D21AEE86F0029FCBB /* one-liner.json */; };
+ 358DDF9021AEED540029FCBB /* simple-route.json in Resources */ = {isa = PBXBuildFile; fileRef = 358DDF8F21AEED540029FCBB /* simple-route.json */; };
3598544D1E1D38AA00B29F84 /* MGLDistanceFormatterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3598544C1E1D38AA00B29F84 /* MGLDistanceFormatterTests.m */; };
359F57461D2FDDA6005217F1 /* MGLUserLocationAnnotationView_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 359F57451D2FDBD5005217F1 /* MGLUserLocationAnnotationView_Private.h */; };
35B82BF81D6C5F8400B1B721 /* NSPredicate+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 35B82BF61D6C5F8400B1B721 /* NSPredicate+MGLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -876,6 +881,12 @@
3575798A1D502B0C000B822E /* MGLBackgroundStyleLayerTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLBackgroundStyleLayerTests.mm; path = ../../darwin/test/MGLBackgroundStyleLayerTests.mm; sourceTree = "<group>"; };
357FE2DB1E02D2B20068B753 /* NSCoder+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSCoder+MGLAdditions.h"; path = "../../darwin/src/NSCoder+MGLAdditions.h"; sourceTree = "<group>"; };
357FE2DC1E02D2B20068B753 /* NSCoder+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "NSCoder+MGLAdditions.mm"; path = "../../darwin/src/NSCoder+MGLAdditions.mm"; sourceTree = "<group>"; };
+ 358DDF8621AEC37B0029FCBB /* iosapp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iosapp-Bridging-Header.h"; sourceTree = "<group>"; };
+ 358DDF8721AEC37C0029FCBB /* OverflowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverflowViewController.swift; sourceTree = "<group>"; };
+ 358DDF8921AEC4330029FCBB /* route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = route.json; sourceTree = "<group>"; };
+ 358DDF8B21AEE5A10029FCBB /* route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = route.json; path = app/route.json; sourceTree = SOURCE_ROOT; };
+ 358DDF8D21AEE86F0029FCBB /* one-liner.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "one-liner.json"; path = "../../darwin/test/one-liner.json"; sourceTree = "<group>"; };
+ 358DDF8F21AEED540029FCBB /* simple-route.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "simple-route.json"; sourceTree = "<group>"; };
3598544C1E1D38AA00B29F84 /* MGLDistanceFormatterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLDistanceFormatterTests.m; path = ../../darwin/test/MGLDistanceFormatterTests.m; sourceTree = "<group>"; };
359F57451D2FDBD5005217F1 /* MGLUserLocationAnnotationView_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLUserLocationAnnotationView_Private.h; sourceTree = "<group>"; };
35B82BF61D6C5F8400B1B721 /* NSPredicate+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLAdditions.h"; sourceTree = "<group>"; };
@@ -1105,7 +1116,7 @@
DA17BE2F1CC4BAC300402C41 /* MGLMapView_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLMapView_Private.h; sourceTree = "<group>"; };
DA1AC01B1E5B8774006DF1D6 /* lt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lt; path = lt.lproj/Localizable.strings; sourceTree = "<group>"; };
DA1AC0201E5B8917006DF1D6 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = uk; path = uk.lproj/Foundation.stringsdict; sourceTree = "<group>"; };
- DA1DC94A1CB6C1C2006E619F /* Mapbox GL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ DA1DC94A1CB6C1C2006E619F /* MapboxGL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MapboxGL.app; sourceTree = BUILT_PRODUCTS_DIR; };
DA1DC9501CB6C1C2006E619F /* MBXAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXAppDelegate.h; sourceTree = "<group>"; };
DA1DC9531CB6C1C2006E619F /* MBXViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXViewController.h; sourceTree = "<group>"; };
DA1DC95E1CB6C1C2006E619F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1797,6 +1808,7 @@
9604FC341F313A5E003EEA02 /* Fixtures */ = {
isa = PBXGroup;
children = (
+ 358DDF8D21AEE86F0029FCBB /* one-liner.json */,
353BAEF51D646370009A8DA9 /* amsterdam.geojson */,
DA1DC96C1CB6C6CE006E619F /* points.geojson */,
DA1DC96D1CB6C6CE006E619F /* polyline.geojson */,
@@ -1845,7 +1857,7 @@
DA1DC94B1CB6C1C2006E619F /* Products */ = {
isa = PBXGroup;
children = (
- DA1DC94A1CB6C1C2006E619F /* Mapbox GL.app */,
+ DA1DC94A1CB6C1C2006E619F /* MapboxGL.app */,
DABCABA81CB80692000A7C39 /* Bench GL.app */,
DA8847D21CBAF91600AB86E3 /* Mapbox.framework */,
DAA4E4131CBB71D400178DFB /* libMapbox.a */,
@@ -1890,6 +1902,8 @@
076171C62141A91700668A35 /* Settings.bundle */,
9604FC341F313A5E003EEA02 /* Fixtures */,
DA1DC94D1CB6C1C2006E619F /* Supporting Files */,
+ 358DDF8721AEC37C0029FCBB /* OverflowViewController.swift */,
+ 358DDF8621AEC37B0029FCBB /* iosapp-Bridging-Header.h */,
);
name = "Demo App";
path = app;
@@ -1898,6 +1912,7 @@
DA1DC94D1CB6C1C2006E619F /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 358DDF8921AEC4330029FCBB /* route.json */,
DA1DC9961CB6E046006E619F /* main.m */,
);
name = "Supporting Files";
@@ -1960,6 +1975,8 @@
DA2E88551CC036F400F24E7B /* Info.plist */,
DA2784FB1DF02FF4001D5B8D /* Media.xcassets */,
DA35D0871E1A6309007DED41 /* one-liner.json */,
+ 358DDF8B21AEE5A10029FCBB /* route.json */,
+ 358DDF8F21AEED540029FCBB /* simple-route.json */,
1F8A59F62165326C004DFE75 /* sideload_sat.db */,
);
name = "SDK Tests";
@@ -2652,7 +2669,7 @@
);
name = iosapp;
productName = iosapp;
- productReference = DA1DC94A1CB6C1C2006E619F /* Mapbox GL.app */;
+ productReference = DA1DC94A1CB6C1C2006E619F /* MapboxGL.app */;
productType = "com.apple.product-type.application";
};
DA2E88501CC036F400F24E7B /* test */ = {
@@ -2766,7 +2783,8 @@
};
DA1DC9491CB6C1C2006E619F = {
CreatedOnToolsVersion = 7.3;
- LastSwiftMigration = 0820;
+ DevelopmentTeam = GJZR2MEM28;
+ LastSwiftMigration = 1010;
};
DA2E88501CC036F400F24E7B = {
CreatedOnToolsVersion = 7.3;
@@ -2858,12 +2876,14 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 358DDF8C21AEE5A20029FCBB /* route.json in Resources */,
DD4823771D94AE6C00EB71B7 /* numeric_filter_style.json in Resources */,
DA1DC9701CB6C6CE006E619F /* points.geojson in Resources */,
353BAEF61D646370009A8DA9 /* amsterdam.geojson in Resources */,
DA1DC9711CB6C6CE006E619F /* polyline.geojson in Resources */,
DD4823761D94AE6C00EB71B7 /* line_filter_style.json in Resources */,
076171C72141A91700668A35 /* Settings.bundle in Resources */,
+ 358DDF9021AEED540029FCBB /* simple-route.json in Resources */,
DA821D071CCC6D59007508D4 /* Main.storyboard in Resources */,
DA1DC9731CB6C6CE006E619F /* threestates.geojson in Resources */,
DA821D061CCC6D59007508D4 /* LaunchScreen.storyboard in Resources */,
@@ -2871,6 +2891,8 @@
1F26B6C320E1A351007BCC21 /* simple_route.json in Resources */,
DD4823751D94AE6C00EB71B7 /* fill_filter_style.json in Resources */,
DA1DC99F1CB6E088006E619F /* Assets.xcassets in Resources */,
+ 358DDF8A21AEC4330029FCBB /* route.json in Resources */,
+ 358DDF8E21AEE86F0029FCBB /* one-liner.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2963,6 +2985,7 @@
DA1DC96A1CB6C6B7006E619F /* MBXCustomCalloutView.m in Sources */,
927FBCFC1F4DAA8300F8BF1F /* MBXSnapshotsViewController.m in Sources */,
DA1DC99B1CB6E064006E619F /* MBXViewController.m in Sources */,
+ 358DDF8821AEC37C0029FCBB /* OverflowViewController.swift in Sources */,
40FDA76B1CCAAA6800442548 /* MBXAnnotationView.m in Sources */,
1F26B6C120E189C9007BCC21 /* MBXCustomLocationViewController.m in Sources */,
3E6465D62065767A00685536 /* LimeGreenStyleLayer.m in Sources */,
@@ -3736,11 +3759,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- DEVELOPMENT_TEAM = "";
+ CLANG_ENABLE_MODULES = YES;
+ DEFINES_MODULE = YES;
+ DEVELOPMENT_TEAM = GJZR2MEM28;
INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL;
- PRODUCT_NAME = "Mapbox GL";
+ PRODUCT_NAME = MapboxGL;
+ SWIFT_OBJC_BRIDGING_HEADER = "app/iosapp-Bridging-Header.h";
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
@@ -3749,11 +3776,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- DEVELOPMENT_TEAM = "";
+ CLANG_ENABLE_MODULES = YES;
+ DEFINES_MODULE = YES;
+ DEVELOPMENT_TEAM = GJZR2MEM28;
INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL;
- PRODUCT_NAME = "Mapbox GL";
+ PRODUCT_NAME = MapboxGL;
+ SWIFT_OBJC_BRIDGING_HEADER = "app/iosapp-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
name = Release;
@@ -3776,10 +3806,10 @@
"$(geometry_cflags)",
"$(geojson_cflags)",
);
- OTHER_LDFLAGS = (
- "$(mbgl_core_LINK_LIBRARIES)",
- "$(mbgl_filesource_LINK_LIBRARIES)",
- );
+ OTHER_LDFLAGS = (
+ "$(mbgl_core_LINK_LIBRARIES)",
+ "$(mbgl_filesource_LINK_LIBRARIES)",
+ );
OTHER_SWIFT_FLAGS = "-warnings-as-errors";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.test;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3807,10 +3837,10 @@
"$(geometry_cflags)",
"$(geojson_cflags)",
);
- OTHER_LDFLAGS = (
- "$(mbgl_core_LINK_LIBRARIES)",
- "$(mbgl_filesource_LINK_LIBRARIES)",
- );
+ OTHER_LDFLAGS = (
+ "$(mbgl_core_LINK_LIBRARIES)",
+ "$(mbgl_filesource_LINK_LIBRARIES)",
+ );
OTHER_SWIFT_FLAGS = "-warnings-as-errors";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.test;
PRODUCT_NAME = "$(TARGET_NAME)";
View Lorry Controller Status