尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Denis Zamataev
Commit e28ca717d7ed8ad751bb00ef4381432933ca617e 1 parent 49e2491a

bumps version

Inline Side-by-side
Showing 1 changed file with 1 additions and 19 deletions
1 Pod::Spec.new do |m| 1 Pod::Spec.new do |m|
2 2
3 -<<<<<<< HEAD:Mapbox-iOS-SDK@sputnik.podspec  
4 m.name = 'Mapbox-iOS-SDK@sputnik' 3 m.name = 'Mapbox-iOS-SDK@sputnik'
5 - m.version = '1.6.1-sputnik'  
6 -=======  
7 - m.name = 'Mapbox-iOS-SDK'  
8 - m.version = '1.6.1'  
9 ->>>>>>> release:Mapbox-iOS-SDK.podspec 4 + m.version = '1.6.2-sputnik'
10 5
11 m.summary = 'Fork of MapBox iOS SDK with some patches.' 6 m.summary = 'Fork of MapBox iOS SDK with some patches.'
12 m.description = 'An open source toolset for building mapping applications for iOS devices with great flexibility for visual styling, offline use, and customizability.' 7 m.description = 'An open source toolset for building mapping applications for iOS devices with great flexibility for visual styling, offline use, and customizability.'
13 -<<<<<<< HEAD:Mapbox-iOS-SDK@sputnik.podspec  
14 m.homepage = 'https://github.com/sputnik-ru/Mapbox-iOS-SDK' 8 m.homepage = 'https://github.com/sputnik-ru/Mapbox-iOS-SDK'
15 m.license = 'BSD' 9 m.license = 'BSD'
16 m.author = { 'Denis Zamataev' => 'zamataev@corp.sputnik.ru' } 10 m.author = { 'Denis Zamataev' => 'zamataev@corp.sputnik.ru' }
17 m.screenshot = 'https://raw.github.com/sputnik-ru/Mapbox-iOS-SDK/packaging/screenshot.png' 11 m.screenshot = 'https://raw.github.com/sputnik-ru/Mapbox-iOS-SDK/packaging/screenshot.png'
18 12
19 m.source = { :git => 'https://github.com/sputnik-ru/Mapbox-iOS-SDK.git', :tag => m.version.to_s } 13 m.source = { :git => 'https://github.com/sputnik-ru/Mapbox-iOS-SDK.git', :tag => m.version.to_s }
20 -=======  
21 - m.homepage = 'https://mapbox.com/mapbox-ios-sdk-legacy'  
22 - m.license = 'BSD'  
23 - m.author = { 'Mapbox' => 'mobile@mapbox.com' }  
24 - m.screenshot = 'https://raw.github.com/mapbox/mapbox-ios-sdk-legacy/packaging/screenshot.png'  
25 - m.social_media_url = 'https://twitter.com/Mapbox'  
26 -  
27 - m.source = {  
28 - :git => 'https://github.com/mapbox/mapbox-ios-sdk-legacy.git',  
29 - :tag => m.version.to_s  
30 - }  
31 ->>>>>>> release:Mapbox-iOS-SDK.podspec  
32 14
33 m.platform = :ios 15 m.platform = :ios
34 m.ios.deployment_target = '5.0' 16 m.ios.deployment_target = '5.0'