diff --git a/platform/ios/benchmark/img/Icon.svg b/common/bench-icon.svg similarity index 100% rename from platform/ios/benchmark/img/Icon.svg rename to common/bench-icon.svg diff --git a/platform/ios/DEVELOPING.md b/platform/ios/DEVELOPING.md index 15693eadb..cac259dee 100644 --- a/platform/ios/DEVELOPING.md +++ b/platform/ios/DEVELOPING.md @@ -12,7 +12,7 @@ The Mapbox iOS SDK and iosapp demo application build against the iOS 7.0 SDK and make iproj -Which will create and open an Xcode project that can build the entire library from source, as well as an Objective-C test app. Before building, use the scheme picker button in the toolbar to change the scheme from “All (ios project)” to “iosapp” and the destination from “My Mac” to one of the simulators or connected devices listed in the menu. +Which will create and open an Xcode project that can build the entire library from source. Now open platform/ios/ios.xcworkspace, which includes both that project and an Objective-C test application. Before building, use the scheme picker button in the toolbar to change the scheme from “All (ios project)” to “iosapp” and the destination from “My Mac” to one of the simulators or connected devices listed in the menu. If you don't have an Apple Developer account, change the destination from "My Mac" to a simulator such as "iPhone 6" before you run and build the app. diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..c1b88669e --- /dev/null +++ b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,86 @@ +{ + "images" : [ + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-Spotlight-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29@2x-1.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40@2x-1.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-83.5@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png new file mode 100644 index 000000000..1e609d328 Binary files /dev/null and b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png new file mode 100644 index 000000000..1e609d328 Binary files /dev/null and b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png new file mode 100644 index 000000000..c7d5aea4e Binary files /dev/null and b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ diff --git a/platform/ios/app/img/Icon-40.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40.png similarity index 100% rename from platform/ios/app/img/Icon-40.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png new file mode 100644 index 000000000..277535538 Binary files /dev/null and b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ diff --git a/platform/ios/app/img/Icon-40@2x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from platform/ios/app/img/Icon-40@2x.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/platform/ios/app/img/Icon-60@2x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png similarity index 100% rename from platform/ios/app/img/Icon-60@2x.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png diff --git a/platform/ios/app/img/Icon-60@3x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png similarity index 100% rename from platform/ios/app/img/Icon-60@3x.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png diff --git a/platform/ios/app/img/Icon-76.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from platform/ios/app/img/Icon-76.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/platform/ios/app/img/Icon-76@2x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png similarity index 100% rename from platform/ios/app/img/Icon-76@2x.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 000000000..0082319b1 Binary files /dev/null and b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/platform/ios/app/img/Icon-Small.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Small.png similarity index 100% rename from platform/ios/app/img/Icon-Small.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Small.png diff --git a/platform/ios/app/img/Icon-Spotlight-40@3x.png b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png similarity index 100% rename from platform/ios/app/img/Icon-Spotlight-40@3x.png rename to platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png diff --git a/platform/ios/app/Assets.xcassets/Contents.json b/platform/ios/app/Assets.xcassets/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/platform/ios/app/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json b/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json new file mode 100644 index 000000000..957660ab7 --- /dev/null +++ b/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "TrackingHeadingMask.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "TrackingHeadingMask@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "TrackingHeadingMask@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/platform/ios/app/img/TrackingHeadingMask.png b/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask.png similarity index 100% rename from platform/ios/app/img/TrackingHeadingMask.png rename to platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask.png diff --git a/platform/ios/app/img/TrackingHeadingMask@2x.png b/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@2x.png similarity index 100% rename from platform/ios/app/img/TrackingHeadingMask@2x.png rename to platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@2x.png diff --git a/platform/ios/app/img/TrackingHeadingMask@3x.png b/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@3x.png similarity index 100% rename from platform/ios/app/img/TrackingHeadingMask@3x.png rename to platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@3x.png diff --git a/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json b/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json new file mode 100644 index 000000000..08cd551fc --- /dev/null +++ b/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "TrackingLocationMask.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "TrackingLocationMask@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "TrackingLocationMask@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/platform/ios/app/img/TrackingLocationMask.png b/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png similarity index 100% rename from platform/ios/app/img/TrackingLocationMask.png rename to platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png diff --git a/platform/ios/app/img/TrackingLocationMask@2x.png b/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png similarity index 100% rename from platform/ios/app/img/TrackingLocationMask@2x.png rename to platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png diff --git a/platform/ios/app/img/TrackingLocationMask@3x.png b/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png similarity index 100% rename from platform/ios/app/img/TrackingLocationMask@3x.png rename to platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png diff --git a/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json b/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json new file mode 100644 index 000000000..3ccbab44a --- /dev/null +++ b/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "TrackingLocationOffMask.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "TrackingLocationOffMask@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "TrackingLocationOffMask@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/platform/ios/app/img/TrackingLocationOffMask.png b/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask.png similarity index 100% rename from platform/ios/app/img/TrackingLocationOffMask.png rename to platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask.png diff --git a/platform/ios/app/img/TrackingLocationOffMask@2x.png b/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@2x.png similarity index 100% rename from platform/ios/app/img/TrackingLocationOffMask@2x.png rename to platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@2x.png diff --git a/platform/ios/app/img/TrackingLocationOffMask@3x.png b/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@3x.png similarity index 100% rename from platform/ios/app/img/TrackingLocationOffMask@3x.png rename to platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@3x.png diff --git a/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json b/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json new file mode 100644 index 000000000..1eeddba9b --- /dev/null +++ b/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "settings.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "settings@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/platform/ios/app/img/settings.png b/platform/ios/app/Assets.xcassets/settings.imageset/settings.png similarity index 100% rename from platform/ios/app/img/settings.png rename to platform/ios/app/Assets.xcassets/settings.imageset/settings.png diff --git a/platform/ios/app/img/settings@2x.png b/platform/ios/app/Assets.xcassets/settings.imageset/settings@2x.png similarity index 100% rename from platform/ios/app/img/settings@2x.png rename to platform/ios/app/Assets.xcassets/settings.imageset/settings@2x.png diff --git a/platform/ios/app/Base.lproj/LaunchScreen.storyboard b/platform/ios/app/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 000000000..323bd4317 --- /dev/null +++ b/platform/ios/app/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/app/Storyboard.storyboard b/platform/ios/app/Base.lproj/Main.storyboard similarity index 99% rename from platform/ios/app/Storyboard.storyboard rename to platform/ios/app/Base.lproj/Main.storyboard index d471e9ded..75b2b68f9 100644 --- a/platform/ios/app/Storyboard.storyboard +++ b/platform/ios/app/Base.lproj/Main.storyboard @@ -1,8 +1,7 @@ - + - - + diff --git a/platform/ios/app/Default-568h@2x.png b/platform/ios/app/Default-568h@2x.png new file mode 100644 index 000000000..0891b7aab Binary files /dev/null and b/platform/ios/app/Default-568h@2x.png differ diff --git a/platform/ios/app/app-info.plist b/platform/ios/app/Info.plist similarity index 97% rename from platform/ios/app/app-info.plist rename to platform/ios/app/Info.plist index 3bece7118..0e5316d33 100644 --- a/platform/ios/app/app-info.plist +++ b/platform/ios/app/Info.plist @@ -42,9 +42,9 @@ NSLocationWhenInUseUsageDescription The map will display the user’s location. UILaunchStoryboardName - Default + LaunchScreen UIMainStoryboardFile - Storyboard + Main UIRequiredDeviceCapabilities armv7 diff --git a/platform/ios/app/Settings.bundle/Root.plist b/platform/ios/app/Settings.bundle/Root.plist deleted file mode 100644 index 889610e15..000000000 --- a/platform/ios/app/Settings.bundle/Root.plist +++ /dev/null @@ -1,33 +0,0 @@ - - - - - PreferenceSpecifiers - - - Title - Privacy Settings - Type - PSGroupSpecifier - FooterText - This setting allows the application to share anonymized location and usage data with Mapbox. - - - DefaultValue - - Key - MGLMapboxMetricsEnabled - Title - Mapbox Telemetry - Type - PSToggleSwitchSpecifier - TrueValue - - FalseValue - - - - StringsTable - Root - - diff --git a/platform/ios/app/Settings.bundle/en.lproj/Root.strings b/platform/ios/app/Settings.bundle/en.lproj/Root.strings deleted file mode 100644 index 5343a34ae..000000000 --- a/platform/ios/app/Settings.bundle/en.lproj/Root.strings +++ /dev/null @@ -1,3 +0,0 @@ -"Privacy Settings" = "Privacy Settings"; -"Mapbox Telemetry" = "Mapbox Telemetry"; -"This setting allows the application to share anonymized location and usage data with Mapbox." = "This setting allows the application to share anonymized location and usage data with Mapbox."; diff --git a/platform/ios/app/img/Default-568h@2x.png b/platform/ios/app/img/Default-568h@2x.png deleted file mode 100644 index ea3706427..000000000 Binary files a/platform/ios/app/img/Default-568h@2x.png and /dev/null differ diff --git a/platform/ios/app/img/Default-667h@2x.png b/platform/ios/app/img/Default-667h@2x.png deleted file mode 100644 index 03f139de6..000000000 Binary files a/platform/ios/app/img/Default-667h@2x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-60.png b/platform/ios/app/img/Icon-60.png deleted file mode 100644 index ff4c6ab4b..000000000 Binary files a/platform/ios/app/img/Icon-60.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-72.png b/platform/ios/app/img/Icon-72.png deleted file mode 100644 index 0c876f664..000000000 Binary files a/platform/ios/app/img/Icon-72.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-72@2x.png b/platform/ios/app/img/Icon-72@2x.png deleted file mode 100644 index 6da408204..000000000 Binary files a/platform/ios/app/img/Icon-72@2x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-76@3x.png b/platform/ios/app/img/Icon-76@3x.png deleted file mode 100644 index 64edff183..000000000 Binary files a/platform/ios/app/img/Icon-76@3x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-Small-50.png b/platform/ios/app/img/Icon-Small-50.png deleted file mode 100644 index 6d17da4b0..000000000 Binary files a/platform/ios/app/img/Icon-Small-50.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-Small-50@2x.png b/platform/ios/app/img/Icon-Small-50@2x.png deleted file mode 100644 index ac4ec1928..000000000 Binary files a/platform/ios/app/img/Icon-Small-50@2x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-Small@2x.png b/platform/ios/app/img/Icon-Small@2x.png deleted file mode 100644 index 7773852e7..000000000 Binary files a/platform/ios/app/img/Icon-Small@2x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-Small@3x.png b/platform/ios/app/img/Icon-Small@3x.png deleted file mode 100644 index e16f3fa6a..000000000 Binary files a/platform/ios/app/img/Icon-Small@3x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-Spotlight-40.png b/platform/ios/app/img/Icon-Spotlight-40.png deleted file mode 100644 index eca13393e..000000000 Binary files a/platform/ios/app/img/Icon-Spotlight-40.png and /dev/null differ diff --git a/platform/ios/app/img/Icon-Spotlight-40@2x.png b/platform/ios/app/img/Icon-Spotlight-40@2x.png deleted file mode 100644 index 070d03753..000000000 Binary files a/platform/ios/app/img/Icon-Spotlight-40@2x.png and /dev/null differ diff --git a/platform/ios/app/img/Icon.png b/platform/ios/app/img/Icon.png deleted file mode 100644 index 9ca8194ee..000000000 Binary files a/platform/ios/app/img/Icon.png and /dev/null differ diff --git a/platform/ios/app/img/Icon@2x.png b/platform/ios/app/img/Icon@2x.png deleted file mode 100644 index 7c2e8ba03..000000000 Binary files a/platform/ios/app/img/Icon@2x.png and /dev/null differ diff --git a/platform/ios/app/img/iTunesArtwork b/platform/ios/app/img/iTunesArtwork deleted file mode 100644 index ac6a0c58e..000000000 Binary files a/platform/ios/app/img/iTunesArtwork and /dev/null differ diff --git a/platform/ios/app/img/iTunesArtwork.png b/platform/ios/app/img/iTunesArtwork.png deleted file mode 100644 index b10824b04..000000000 Binary files a/platform/ios/app/img/iTunesArtwork.png and /dev/null differ diff --git a/platform/ios/app/img/iTunesArtwork@2x b/platform/ios/app/img/iTunesArtwork@2x deleted file mode 100644 index fae1dad8b..000000000 Binary files a/platform/ios/app/img/iTunesArtwork@2x and /dev/null differ diff --git a/platform/ios/app/img/iTunesArtwork@2x.png b/platform/ios/app/img/iTunesArtwork@2x.png deleted file mode 100644 index fdee900aa..000000000 Binary files a/platform/ios/app/img/iTunesArtwork@2x.png and /dev/null differ diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..73f0fa249 --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-1.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-2.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-3.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-4.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "iTunesArtwork.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "iTunesArtwork@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png new file mode 100644 index 000000000..8133332fe Binary files /dev/null and b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png differ diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png new file mode 100644 index 000000000..9b7db0607 Binary files /dev/null and b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png differ diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png new file mode 100644 index 000000000..8f61a8ec0 Binary files /dev/null and b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png differ diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png new file mode 100644 index 000000000..783467e2a Binary files /dev/null and b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png differ diff --git a/platform/ios/benchmark/img/Icon-40.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png similarity index 100% rename from platform/ios/benchmark/img/Icon-40.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/platform/ios/benchmark/img/Icon-40@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from platform/ios/benchmark/img/Icon-40@2x.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/platform/ios/benchmark/img/Icon-40@3x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png similarity index 100% rename from platform/ios/benchmark/img/Icon-40@3x.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/platform/ios/benchmark/img/Icon-76.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from platform/ios/benchmark/img/Icon-76.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/platform/ios/benchmark/img/Icon-76@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png similarity index 100% rename from platform/ios/benchmark/img/Icon-76@2x.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/platform/ios/benchmark/img/Icon-Small.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png similarity index 100% rename from platform/ios/benchmark/img/Icon-Small.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png diff --git a/platform/ios/benchmark/img/Icon-Small@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png similarity index 100% rename from platform/ios/benchmark/img/Icon-Small@2x.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png diff --git a/platform/ios/benchmark/img/Icon-Small@3x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png similarity index 100% rename from platform/ios/benchmark/img/Icon-Small@3x.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png new file mode 100644 index 000000000..2c9ecb48c Binary files /dev/null and b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png differ diff --git a/platform/ios/benchmark/img/iTunesArtwork.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png similarity index 100% rename from platform/ios/benchmark/img/iTunesArtwork.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png diff --git a/platform/ios/benchmark/img/iTunesArtwork@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png similarity index 100% rename from platform/ios/benchmark/img/iTunesArtwork@2x.png rename to platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png diff --git a/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard b/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 000000000..323bd4317 --- /dev/null +++ b/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/benchmark/app-info.plist b/platform/ios/benchmark/Info.plist similarity index 98% rename from platform/ios/benchmark/app-info.plist rename to platform/ios/benchmark/Info.plist index 9d0aad09e..22ea46152 100644 --- a/platform/ios/benchmark/app-info.plist +++ b/platform/ios/benchmark/Info.plist @@ -29,7 +29,7 @@ UIApplicationExitsOnSuspend UILaunchStoryboardName - Default + LaunchScreen UIRequiredDeviceCapabilities armv7 diff --git a/platform/ios/benchmark/img/Icon-60.png b/platform/ios/benchmark/img/Icon-60.png deleted file mode 100644 index 409fad814..000000000 Binary files a/platform/ios/benchmark/img/Icon-60.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon-60@2x.png b/platform/ios/benchmark/img/Icon-60@2x.png deleted file mode 100644 index 89c7119ac..000000000 Binary files a/platform/ios/benchmark/img/Icon-60@2x.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon-60@3x.png b/platform/ios/benchmark/img/Icon-60@3x.png deleted file mode 100644 index 158bcfe27..000000000 Binary files a/platform/ios/benchmark/img/Icon-60@3x.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon-72.png b/platform/ios/benchmark/img/Icon-72.png deleted file mode 100644 index eecd90b5e..000000000 Binary files a/platform/ios/benchmark/img/Icon-72.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon-72@2x.png b/platform/ios/benchmark/img/Icon-72@2x.png deleted file mode 100644 index ca28d1fa0..000000000 Binary files a/platform/ios/benchmark/img/Icon-72@2x.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon-Small-50.png b/platform/ios/benchmark/img/Icon-Small-50.png deleted file mode 100644 index a07103474..000000000 Binary files a/platform/ios/benchmark/img/Icon-Small-50.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon-Small-50@2x.png b/platform/ios/benchmark/img/Icon-Small-50@2x.png deleted file mode 100644 index 5d7c76d5e..000000000 Binary files a/platform/ios/benchmark/img/Icon-Small-50@2x.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon.png b/platform/ios/benchmark/img/Icon.png deleted file mode 100644 index 7af0c68a3..000000000 Binary files a/platform/ios/benchmark/img/Icon.png and /dev/null differ diff --git a/platform/ios/benchmark/img/Icon@2x.png b/platform/ios/benchmark/img/Icon@2x.png deleted file mode 100644 index ff5ea0c07..000000000 Binary files a/platform/ios/benchmark/img/Icon@2x.png and /dev/null differ diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj new file mode 100644 index 000000000..0a65316d7 --- /dev/null +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -0,0 +1,518 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + DA1DC96A1CB6C6B7006E619F /* MBXCustomCalloutView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA1DC9671CB6C6B7006E619F /* MBXCustomCalloutView.m */; }; + DA1DC96B1CB6C6B7006E619F /* MBXOfflinePacksTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA1DC9691CB6C6B7006E619F /* MBXOfflinePacksTableViewController.m */; }; + DA1DC9701CB6C6CE006E619F /* points.geojson in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC96C1CB6C6CE006E619F /* points.geojson */; }; + DA1DC9711CB6C6CE006E619F /* polyline.geojson in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC96D1CB6C6CE006E619F /* polyline.geojson */; }; + DA1DC9721CB6C6CE006E619F /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC96E1CB6C6CE006E619F /* Settings.bundle */; }; + DA1DC9731CB6C6CE006E619F /* threestates.geojson in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC96F1CB6C6CE006E619F /* threestates.geojson */; }; + DA1DC9971CB6E046006E619F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA1DC9961CB6E046006E619F /* main.m */; }; + DA1DC9991CB6E054006E619F /* MBXAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA1DC9981CB6E054006E619F /* MBXAppDelegate.m */; }; + DA1DC99B1CB6E064006E619F /* MBXViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA1DC99A1CB6E064006E619F /* MBXViewController.m */; }; + DA1DC99D1CB6E076006E619F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC99C1CB6E076006E619F /* Default-568h@2x.png */; }; + DA1DC99F1CB6E088006E619F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC99E1CB6E088006E619F /* Assets.xcassets */; }; + DA4A26941CB6E337000B7809 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC9561CB6C1C2006E619F /* Main.storyboard */; }; + DA4A26951CB6E337000B7809 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA1DC95B1CB6C1C2006E619F /* LaunchScreen.storyboard */; }; + DA4A26981CB6F5D3000B7809 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; }; + DA4A26991CB6F5D3000B7809 /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + DABCABAC1CB80692000A7C39 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DABCABAB1CB80692000A7C39 /* main.m */; }; + DABCABAF1CB80692000A7C39 /* MBXBenchAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DABCABAE1CB80692000A7C39 /* MBXBenchAppDelegate.m */; }; + DABCABB21CB80692000A7C39 /* MBXBenchViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = DABCABB11CB80692000A7C39 /* MBXBenchViewController.mm */; }; + DABCABB71CB80692000A7C39 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DABCABB61CB80692000A7C39 /* Assets.xcassets */; }; + DABCABBA1CB80692000A7C39 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DABCABB81CB80692000A7C39 /* LaunchScreen.storyboard */; }; + DABCABC21CB8071D000A7C39 /* locations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DABCABBF1CB80717000A7C39 /* locations.cpp */; }; + DABCABC31CB808BC000A7C39 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; }; + DABCABC41CB808BC000A7C39 /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA4A26961CB6E795000B7809 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + DA4A269A1CB6F5D3000B7809 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + DA4A26991CB6F5D3000B7809 /* Mapbox.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + DABCABC51CB808BC000A7C39 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + DABCABC41CB808BC000A7C39 /* Mapbox.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + DA1DC94A1CB6C1C2006E619F /* Mapbox GL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "Mapbox GL.app"; path = "Mapbox GL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + DA1DC9501CB6C1C2006E619F /* MBXAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXAppDelegate.h; sourceTree = ""; }; + DA1DC9531CB6C1C2006E619F /* MBXViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXViewController.h; sourceTree = ""; }; + DA1DC9571CB6C1C2006E619F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + DA1DC95C1CB6C1C2006E619F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + DA1DC95E1CB6C1C2006E619F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + DA1DC9661CB6C6B7006E619F /* MBXCustomCalloutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBXCustomCalloutView.h; sourceTree = ""; }; + DA1DC9671CB6C6B7006E619F /* MBXCustomCalloutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXCustomCalloutView.m; sourceTree = ""; }; + DA1DC9681CB6C6B7006E619F /* MBXOfflinePacksTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBXOfflinePacksTableViewController.h; sourceTree = ""; }; + DA1DC9691CB6C6B7006E619F /* MBXOfflinePacksTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXOfflinePacksTableViewController.m; sourceTree = ""; }; + DA1DC96C1CB6C6CE006E619F /* points.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = points.geojson; sourceTree = ""; }; + DA1DC96D1CB6C6CE006E619F /* polyline.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = polyline.geojson; sourceTree = ""; }; + DA1DC96E1CB6C6CE006E619F /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = ../framework/Settings.bundle; sourceTree = ""; }; + DA1DC96F1CB6C6CE006E619F /* threestates.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = threestates.geojson; sourceTree = ""; }; + DA1DC9961CB6E046006E619F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + DA1DC9981CB6E054006E619F /* MBXAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXAppDelegate.m; sourceTree = ""; }; + DA1DC99A1CB6E064006E619F /* MBXViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXViewController.m; sourceTree = ""; }; + DA1DC99C1CB6E076006E619F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + DA1DC99E1CB6E088006E619F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + DA4A26961CB6E795000B7809 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DABCABA81CB80692000A7C39 /* Bench GL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Bench GL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + DABCABAB1CB80692000A7C39 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + DABCABAD1CB80692000A7C39 /* MBXBenchAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXBenchAppDelegate.h; sourceTree = ""; }; + DABCABAE1CB80692000A7C39 /* MBXBenchAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBXBenchAppDelegate.m; sourceTree = ""; }; + DABCABB01CB80692000A7C39 /* MBXBenchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBXBenchViewController.h; sourceTree = ""; }; + DABCABB11CB80692000A7C39 /* MBXBenchViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MBXBenchViewController.mm; sourceTree = ""; }; + DABCABB61CB80692000A7C39 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + DABCABB91CB80692000A7C39 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + DABCABBB1CB80692000A7C39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + DABCABBF1CB80717000A7C39 /* locations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locations.cpp; sourceTree = ""; }; + DABCABC01CB80717000A7C39 /* locations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locations.hpp; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + DA1DC9471CB6C1C2006E619F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DA4A26981CB6F5D3000B7809 /* Mapbox.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + DABCABA51CB80692000A7C39 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DABCABC31CB808BC000A7C39 /* Mapbox.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + DA1DC9411CB6C1C2006E619F = { + isa = PBXGroup; + children = ( + DA1DC94C1CB6C1C2006E619F /* iosapp */, + DABCABA91CB80692000A7C39 /* benchmark */, + DA1DC9921CB6DF24006E619F /* Frameworks */, + DA1DC94B1CB6C1C2006E619F /* Products */, + ); + sourceTree = ""; + }; + DA1DC94B1CB6C1C2006E619F /* Products */ = { + isa = PBXGroup; + children = ( + DA1DC94A1CB6C1C2006E619F /* iosapp.app */, + DABCABA81CB80692000A7C39 /* Bench GL.app */, + ); + name = Products; + sourceTree = ""; + }; + DA1DC94C1CB6C1C2006E619F /* iosapp */ = { + isa = PBXGroup; + children = ( + DA1DC9501CB6C1C2006E619F /* MBXAppDelegate.h */, + DA1DC9981CB6E054006E619F /* MBXAppDelegate.m */, + DA1DC9661CB6C6B7006E619F /* MBXCustomCalloutView.h */, + DA1DC9671CB6C6B7006E619F /* MBXCustomCalloutView.m */, + DA1DC9681CB6C6B7006E619F /* MBXOfflinePacksTableViewController.h */, + DA1DC9691CB6C6B7006E619F /* MBXOfflinePacksTableViewController.m */, + DA1DC9531CB6C1C2006E619F /* MBXViewController.h */, + DA1DC99A1CB6E064006E619F /* MBXViewController.m */, + DA1DC9561CB6C1C2006E619F /* Main.storyboard */, + DA1DC95B1CB6C1C2006E619F /* LaunchScreen.storyboard */, + DA1DC99E1CB6E088006E619F /* Assets.xcassets */, + DA1DC96C1CB6C6CE006E619F /* points.geojson */, + DA1DC96D1CB6C6CE006E619F /* polyline.geojson */, + DA1DC96F1CB6C6CE006E619F /* threestates.geojson */, + DA1DC96E1CB6C6CE006E619F /* Settings.bundle */, + DA1DC95E1CB6C1C2006E619F /* Info.plist */, + DA1DC99C1CB6E076006E619F /* Default-568h@2x.png */, + DA1DC94D1CB6C1C2006E619F /* Supporting Files */, + ); + name = iosapp; + path = app; + sourceTree = ""; + }; + DA1DC94D1CB6C1C2006E619F /* Supporting Files */ = { + isa = PBXGroup; + children = ( + DA1DC9961CB6E046006E619F /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + DA1DC9921CB6DF24006E619F /* Frameworks */ = { + isa = PBXGroup; + children = ( + DA4A26961CB6E795000B7809 /* Mapbox.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + DABCABA91CB80692000A7C39 /* benchmark */ = { + isa = PBXGroup; + children = ( + DABCABAD1CB80692000A7C39 /* MBXBenchAppDelegate.h */, + DABCABAE1CB80692000A7C39 /* MBXBenchAppDelegate.m */, + DABCABB01CB80692000A7C39 /* MBXBenchViewController.h */, + DABCABB11CB80692000A7C39 /* MBXBenchViewController.mm */, + DABCABBF1CB80717000A7C39 /* locations.cpp */, + DABCABC01CB80717000A7C39 /* locations.hpp */, + DABCABB61CB80692000A7C39 /* Assets.xcassets */, + DABCABB81CB80692000A7C39 /* LaunchScreen.storyboard */, + DABCABBB1CB80692000A7C39 /* Info.plist */, + DABCABAA1CB80692000A7C39 /* Supporting Files */, + ); + path = benchmark; + sourceTree = ""; + }; + DABCABAA1CB80692000A7C39 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + DABCABAB1CB80692000A7C39 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + DA1DC9491CB6C1C2006E619F /* iosapp */ = { + isa = PBXNativeTarget; + buildConfigurationList = DA1DC9611CB6C1C2006E619F /* Build configuration list for PBXNativeTarget "iosapp" */; + buildPhases = ( + DA1DC9461CB6C1C2006E619F /* Sources */, + DA1DC9471CB6C1C2006E619F /* Frameworks */, + DA1DC9481CB6C1C2006E619F /* Resources */, + DA4A269A1CB6F5D3000B7809 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = iosapp; + productName = iosapp; + productReference = DA1DC94A1CB6C1C2006E619F /* iosapp.app */; + productType = "com.apple.product-type.application"; + }; + DABCABA71CB80692000A7C39 /* bench */ = { + isa = PBXNativeTarget; + buildConfigurationList = DABCABBE1CB80692000A7C39 /* Build configuration list for PBXNativeTarget "bench" */; + buildPhases = ( + DABCABA41CB80692000A7C39 /* Sources */, + DABCABA51CB80692000A7C39 /* Frameworks */, + DABCABA61CB80692000A7C39 /* Resources */, + DABCABC51CB808BC000A7C39 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = bench; + productName = bench; + productReference = DABCABA81CB80692000A7C39 /* Bench GL.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + DA1DC9421CB6C1C2006E619F /* Project object */ = { + isa = PBXProject; + attributes = { + CLASSPREFIX = MBX; + LastUpgradeCheck = 0730; + ORGANIZATIONNAME = Mapbox; + TargetAttributes = { + DA1DC9491CB6C1C2006E619F = { + CreatedOnToolsVersion = 7.3; + }; + DABCABA71CB80692000A7C39 = { + CreatedOnToolsVersion = 7.3; + }; + }; + }; + buildConfigurationList = DA1DC9451CB6C1C2006E619F /* Build configuration list for PBXProject "ios" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = DA1DC9411CB6C1C2006E619F; + productRefGroup = DA1DC94B1CB6C1C2006E619F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + DA1DC9491CB6C1C2006E619F /* iosapp */, + DABCABA71CB80692000A7C39 /* bench */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + DA1DC9481CB6C1C2006E619F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DA4A26941CB6E337000B7809 /* Main.storyboard in Resources */, + DA4A26951CB6E337000B7809 /* LaunchScreen.storyboard in Resources */, + DA1DC9701CB6C6CE006E619F /* points.geojson in Resources */, + DA1DC9711CB6C6CE006E619F /* polyline.geojson in Resources */, + DA1DC99D1CB6E076006E619F /* Default-568h@2x.png in Resources */, + DA1DC9731CB6C6CE006E619F /* threestates.geojson in Resources */, + DA1DC99F1CB6E088006E619F /* Assets.xcassets in Resources */, + DA1DC9721CB6C6CE006E619F /* Settings.bundle in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + DABCABA61CB80692000A7C39 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DABCABBA1CB80692000A7C39 /* LaunchScreen.storyboard in Resources */, + DABCABB71CB80692000A7C39 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + DA1DC9461CB6C1C2006E619F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DA1DC9971CB6E046006E619F /* main.m in Sources */, + DA1DC9991CB6E054006E619F /* MBXAppDelegate.m in Sources */, + DA1DC96B1CB6C6B7006E619F /* MBXOfflinePacksTableViewController.m in Sources */, + DA1DC96A1CB6C6B7006E619F /* MBXCustomCalloutView.m in Sources */, + DA1DC99B1CB6E064006E619F /* MBXViewController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + DABCABA41CB80692000A7C39 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DABCABB21CB80692000A7C39 /* MBXBenchViewController.mm in Sources */, + DABCABAF1CB80692000A7C39 /* MBXBenchAppDelegate.m in Sources */, + DABCABC21CB8071D000A7C39 /* locations.cpp in Sources */, + DABCABAC1CB80692000A7C39 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + DA1DC9561CB6C1C2006E619F /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + DA1DC9571CB6C1C2006E619F /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + DA1DC95B1CB6C1C2006E619F /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + DA1DC95C1CB6C1C2006E619F /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; + DABCABB81CB80692000A7C39 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + DABCABB91CB80692000A7C39 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + DA1DC95F1CB6C1C2006E619F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + DA1DC9601CB6C1C2006E619F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + DA1DC9621CB6C1C2006E619F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; + PRODUCT_NAME = "Mapbox GL"; + }; + name = Debug; + }; + DA1DC9631CB6C1C2006E619F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; + PRODUCT_NAME = "Mapbox GL"; + }; + name = Release; + }; + DABCABBC1CB80692000A7C39 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = "$(SRCROOT)/benchmark/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.bench; + PRODUCT_NAME = "Bench GL"; + }; + name = Debug; + }; + DABCABBD1CB80692000A7C39 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = "$(SRCROOT)/benchmark/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.bench; + PRODUCT_NAME = "Bench GL"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + DA1DC9451CB6C1C2006E619F /* Build configuration list for PBXProject "ios" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DA1DC95F1CB6C1C2006E619F /* Debug */, + DA1DC9601CB6C1C2006E619F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + DA1DC9611CB6C1C2006E619F /* Build configuration list for PBXNativeTarget "iosapp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DA1DC9621CB6C1C2006E619F /* Debug */, + DA1DC9631CB6C1C2006E619F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + DABCABBE1CB80692000A7C39 /* Build configuration list for PBXNativeTarget "bench" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DABCABBC1CB80692000A7C39 /* Debug */, + DABCABBD1CB80692000A7C39 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = DA1DC9421CB6C1C2006E619F /* Project object */; +} diff --git a/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..92ad79b9d --- /dev/null +++ b/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme new file mode 100644 index 000000000..bfddf3c6c --- /dev/null +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme new file mode 100644 index 000000000..064add0fe --- /dev/null +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/ios.xcworkspace/contents.xcworkspacedata b/platform/ios/ios.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..a5b164b6c --- /dev/null +++ b/platform/ios/ios.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/platform/ios/ios.xcworkspace/xcshareddata/ios.xcscmblueprint b/platform/ios/ios.xcworkspace/xcshareddata/ios.xcscmblueprint new file mode 100644 index 000000000..a86fb58e7 --- /dev/null +++ b/platform/ios/ios.xcworkspace/xcshareddata/ios.xcscmblueprint @@ -0,0 +1,37 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "7E68CB584078A487C0535CC191D3B7551EEE2095", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "10265E242415D473A6A613214DB7AC3EE3D43F93" : 0, + "D1BB63D501E0048981F00509C5A268D4AF5FEE4C" : 0, + "7E68CB584078A487C0535CC191D3B7551EEE2095" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D6F4212C-91A7-4C87-9973-DF38C92B9C5F", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "10265E242415D473A6A613214DB7AC3EE3D43F93" : "mapbox-gl-native\/platform\/ios\/test\/KIF\/", + "D1BB63D501E0048981F00509C5A268D4AF5FEE4C" : "mapbox-gl-native\/platform\/ios\/vendor\/SMCalloutView\/", + "7E68CB584078A487C0535CC191D3B7551EEE2095" : "mapbox-gl-native\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "ios", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "platform\/ios\/ios.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kif-framework\/KIF.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "10265E242415D473A6A613214DB7AC3EE3D43F93" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mapbox\/mapbox-gl-native.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7E68CB584078A487C0535CC191D3B7551EEE2095" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mapbox\/smcalloutview.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D1BB63D501E0048981F00509C5A268D4AF5FEE4C" + } + ] +} \ No newline at end of file diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp index a38ab3869..77bf6d6eb 100644 --- a/platform/ios/platform.gyp +++ b/platform/ios/platform.gyp @@ -266,152 +266,6 @@ }, }, }, - }, - { - 'target_name': 'iosapp', - 'product_name': 'Mapbox GL', - 'type': 'executable', - 'product_extension': 'app', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - '"; }; - DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; }; + DA482C7F1C12582600772FE3 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DADD9EB51BD16D8B00DA9161 /* Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Compatibility.h; path = OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h; sourceTree = SOURCE_ROOT; }; DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTAppDelegate.m; sourceTree = SOURCE_ROOT; }; @@ -147,7 +146,6 @@ DD04331A196DB9BC00E6F39D = { isa = PBXGroup; children = ( - DA482C7F1C12582600772FE3 /* Mapbox.framework */, DD04332C196DB9BC00E6F39D /* App */, DDBD0139196DC38D0033959E /* Tests */, DD043325196DB9BC00E6F39D /* Frameworks */, @@ -167,6 +165,7 @@ DD043325196DB9BC00E6F39D /* Frameworks */ = { isa = PBXGroup; children = ( + DA482C7F1C12582600772FE3 /* Mapbox.framework */, DD0580E71ACB628200B112C9 /* IOKit.framework */, ); name = Frameworks; @@ -179,7 +178,6 @@ DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */, DD043361196DBBD500E6F39D /* MGLTViewController.h */, DD043360196DBBD500E6F39D /* MGLTViewController.m */, - DDAE739B1ACB557500E1A793 /* GL Library */, DD04332D196DB9BC00E6F39D /* Supporting Files */, ); name = App; @@ -242,14 +240,6 @@ name = OHHTTPStubs; sourceTree = ""; }; - DDAE739B1ACB557500E1A793 /* GL Library */ = { - isa = PBXGroup; - children = ( - DACAD7111B08719F009119DC /* MGLMapboxEvents.h */, - ); - name = "GL Library"; - sourceTree = ""; - }; DDBD0139196DC38D0033959E /* Tests */ = { isa = PBXGroup; children = ( @@ -545,10 +535,6 @@ INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../mason_packages/**", - ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -570,10 +556,6 @@ INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../mason_packages/**", - ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)";