summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-05-04 17:04:46 -0500
committerBrad Leege <bleege@gmail.com>2015-05-04 17:04:46 -0500
commit4ce4e979ff85f8fc135fccf675c6a5e8939cdd66 (patch)
treedd49fd5b095445d9ef2ff28ec64157bacbbe2dd5 /ios
parent7f6cc6cc6d462952c02fbc50bd90f4f765a55809 (diff)
parentc2858dd45f735d99b1bc46043cff0b2a6b176c63 (diff)
downloadqtlocation-mapboxgl-4ce4e979ff85f8fc135fccf675c6a5e8939cdd66.tar.gz
Updating from master
Diffstat (limited to 'ios')
-rw-r--r--ios/MapboxGL.podspec2
-rw-r--r--ios/app/MBXViewController.mm1
-rw-r--r--ios/app/app-info.plist2
-rw-r--r--ios/app/mapboxgl-app.gypi (renamed from ios/app/mapboxgl-app.gyp)16
4 files changed, 10 insertions, 11 deletions
diff --git a/ios/MapboxGL.podspec b/ios/MapboxGL.podspec
index 57de3f6f30..ad54700207 100644
--- a/ios/MapboxGL.podspec
+++ b/ios/MapboxGL.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |m|
m.name = 'MapboxGL'
- m.version = '0.2.15'
+ m.version = '0.2.19'
m.summary = 'Open source vector map solution for iOS with full styling capabilities.'
m.description = 'Open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.'
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index 394536b98b..eb77a2ec80 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -54,7 +54,6 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
- self.mapView.viewControllerForLayoutGuides = self;
self.mapView.showsUserLocation = YES;
self.mapView.delegate = self;
[self.view addSubview:self.mapView];
diff --git a/ios/app/app-info.plist b/ios/app/app-info.plist
index cd74f58390..fd03e73241 100644
--- a/ios/app/app-info.plist
+++ b/ios/app/app-info.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>MBGL</string>
<key>CFBundleVersion</key>
- <string>0.0.2</string>
+ <string>0.0.3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSHumanReadableCopyright</key>
diff --git a/ios/app/mapboxgl-app.gyp b/ios/app/mapboxgl-app.gypi
index 0e093a1d8d..73b66dff12 100644
--- a/ios/app/mapboxgl-app.gyp
+++ b/ios/app/mapboxgl-app.gypi
@@ -9,18 +9,18 @@
'product_extension': 'app',
'mac_bundle': 1,
'mac_bundle_resources': [
- '<!@(find ./img -type f)',
+ '<!@(find ../ios/app/img -type f)',
'./features.geojson',
'./Settings.bundle/'
],
'dependencies': [
- '../../mbgl.gyp:bundle_styles',
- '../../mbgl.gyp:core',
- '../../mbgl.gyp:platform-<(platform_lib)',
- '../../mbgl.gyp:http-<(http_lib)',
- '../../mbgl.gyp:asset-<(asset_lib)',
- '../../mbgl.gyp:cache-<(cache_lib)',
+ '../mbgl.gyp:bundle_styles',
+ '../mbgl.gyp:core',
+ '../mbgl.gyp:platform-<(platform_lib)',
+ '../mbgl.gyp:http-<(http_lib)',
+ '../mbgl.gyp:asset-<(asset_lib)',
+ '../mbgl.gyp:cache-<(cache_lib)',
],
'sources': [
@@ -38,7 +38,7 @@
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
- 'INFOPLIST_FILE': 'app-info.plist',
+ 'INFOPLIST_FILE': '../ios/app/app-info.plist',
'TARGETED_DEVICE_FAMILY': '1,2',
'COMBINE_HIDPI_IMAGES': 'NO', # don't merge @2x.png images into .tiff files
'CLANG_ENABLE_OBJC_ARC': 'YES',