summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-12-07 13:03:26 -0800
committerJustin R. Miller <incanus@codesorcery.net>2015-12-07 13:03:26 -0800
commit7beb051c2616493de2d2084ca03749535676b123 (patch)
tree89282e29778c184c3773d20558afaa3059ef71a6
parent032e3a66f35aa4fd3954a700d5753cd21e06a59d (diff)
parentc8c485090b6033c8dd72973a705d7ba009d120a8 (diff)
downloadqtlocation-mapboxgl-7beb051c2616493de2d2084ca03749535676b123.tar.gz
Merge branch 'release-ios-v3.0.1'
-rw-r--r--ios/Mapbox-iOS-SDK.podspec18
-rw-r--r--platform/ios/MGLAccountManager.m2
2 files changed, 10 insertions, 10 deletions
diff --git a/ios/Mapbox-iOS-SDK.podspec b/ios/Mapbox-iOS-SDK.podspec
index a470ff53a9..00ded8968e 100644
--- a/ios/Mapbox-iOS-SDK.podspec
+++ b/ios/Mapbox-iOS-SDK.podspec
@@ -1,15 +1,15 @@
Pod::Spec.new do |m|
m.name = 'Mapbox-iOS-SDK'
- m.version = '3.0.0-symbols'
-
- 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 Touch APIs.'
- m.homepage = 'https://www.mapbox.com/ios-sdk/'
- m.license = 'BSD'
- m.author = { 'Mapbox' => 'mobile@mapbox.com' }
- m.screenshot = 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png'
- m.social_media_url = 'https://twitter.com/mapbox'
+ m.version = '3.0.1'
+
+ 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.'
+ m.homepage = 'https://www.mapbox.com/ios-sdk/'
+ m.license = { :type => 'BSD', :file => 'Mapbox.framework/LICENSE.md' }
+ m.author = { 'Mapbox' => 'mobile@mapbox.com' }
+ m.screenshot = 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png'
+ m.social_media_url = 'https://twitter.com/mapbox'
m.documentation_url = 'https://www.mapbox.com/ios-sdk/'
m.source = {
diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m
index edc5c463f6..8bfe1d68b3 100644
--- a/platform/ios/MGLAccountManager.m
+++ b/platform/ios/MGLAccountManager.m
@@ -86,7 +86,7 @@
}
+ (NSString *)kitDisplayVersion {
- return @"3.0.0";
+ return @"3.0.1";
}
+ (void)initializeIfNeeded {