Skip to content

Update podspec to 0.1.0 for release #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msmollin merged 2 commits into from
Jan 30, 2017
Merged

Update podspec to 0.1.0 for release #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a384561
Update podspec to 0.1.0 for release
Jan 27, 2017
04e60cb
Update sample app to use trunk SDKs
Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
platform :ios, '9.0'
platform :ios, '9.3'
use_frameworks!

def shared_pods
pod 'Pelias', :git => 'https://github.com/pelias/pelias-ios-sdk.git', :branch => 'master'
pod 'OnTheRoad', :git => 'https://github.com/mapzen/on-the-road_ios.git', :branch => 'master'
pod 'Tangram-es', :git => 'https://github.com/tangrams/ios-framework.git', :branch => 'master'
pod 'Pelias', '~> 1.0.0-beta'
pod 'OnTheRoad', '~> 1.0.0-beta'
pod 'Tangram-es', '~> 0.4'
end

target "ios-sdk" do
Expand Down
36 changes: 7 additions & 29 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,18 @@ PODS:
- Pelias (1.0.0-beta3):
- Pelias/Core (= 1.0.0-beta3)
- Pelias/Core (1.0.0-beta3)
- Tangram-es (0.1.0)
- Tangram-es (0.4.0)

DEPENDENCIES:
- OnTheRoad (from `https://github.com/mapzen/on-the-road_ios.git`, branch `master`)
- Pelias (from `https://github.com/pelias/pelias-ios-sdk.git`, branch `master`)
- Tangram-es (from `https://github.com/tangrams/ios-framework.git`, branch `master`)

EXTERNAL SOURCES:
OnTheRoad:
:branch: master
:git: https://github.com/mapzen/on-the-road_ios.git
Pelias:
:branch: master
:git: https://github.com/pelias/pelias-ios-sdk.git
Tangram-es:
:branch: master
:git: https://github.com/tangrams/ios-framework.git

CHECKOUT OPTIONS:
OnTheRoad:
:commit: 8b65272e369dfa07c1255eee6130a2df79b6da9e
:git: https://github.com/mapzen/on-the-road_ios.git
Pelias:
:commit: ba13625b8445c5b7a8b8de08b702fcf2425ad9c9
:git: https://github.com/pelias/pelias-ios-sdk.git
Tangram-es:
:commit: f7a96d812a27b012620cb5f63de4e770c01b85db
:git: https://github.com/tangrams/ios-framework.git
- OnTheRoad (~> 1.0.0-beta)
- Pelias (~> 1.0.0-beta)
- Tangram-es (~> 0.4)

SPEC CHECKSUMS:
OnTheRoad: 994e273d08efcfb598195f6235bf48d1e525602e
Pelias: 73fe42b321402cfe5beaeeb2dd4625ce897ffffe
Tangram-es: 0b836ead54f672545dc5bfcf0ae46e6f4b97c1ff
Pelias: 79a3ca6332a7cb48945b5d044f564b95f13a516e
Tangram-es: 49354b4ba6bbd180c2db90f79b4ed957f68e7525

PODFILE CHECKSUM: c5f76346e1f9ed6d4fb353437cbb5c798f8f9061
PODFILE CHECKSUM: d28cc38afbc26b27972877b46d3b976b73861b15

COCOAPODS: 1.1.1
16 changes: 8 additions & 8 deletions ios-sdk.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
Pod::Spec.new do |s|

s.name = 'ios-sdk'
s.name = 'Mapzen-ios-sdk'
s.version = '0.1.0'

s.summary = 'Mapzen iOS SDK'
s.description = 'Mapzen iOS SDK'
s.description = 'The Mapzen iOS SDK is a thin wrapper that packages up everything you need to use Mapzen services in your iOS applications. It also simplifies setup, installation, API key management, and generally makes your life better.'
s.homepage = 'https://mapzen.com/projects/mobile/'
s.license = { :type => 'MIT', :file => 'LICENSE.md' }
s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE.md' }
s.author = { 'Mapzen' => 'ios-support@mapzen.com' }
s.social_media_url = 'https://twitter.com/mapzen'
s.documentation_url = 'https://mapzen.com/documentation/ios/'
s.source = { :git => 'https://github.com/mapzen/ios.git', :branch => 'master' }
s.source = { :git => 'https://github.com/mapzen/ios.git', :tag => "v#{s.version}" }
Copy link
Copy Markdown
Collaborator

@ecgreb ecgreb Jan 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will need to manually push the tag v0.1.0 to this repo after this merges, correct?

Copy link
Copy Markdown
Member Author

@msmollin msmollin Jan 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I was doing some reading and it seems like if you tag on the branch and do a merge commit it is fine, but tags don't really live in branches so it's weird.


s.platform = :ios
s.ios.deployment_target = '9.0'
s.ios.deployment_target = '9.3'

s.requires_arc = true
s.default_subspec = 'Core'

s.subspec 'Core' do |cs|
cs.dependency "Pelias"
cs.dependency "OnTheRoad"
cs.dependency "Tangram-es"
cs.dependency 'Pelias', '~> 1.0.0-beta'
cs.dependency 'OnTheRoad', '~> 1.0.0-beta'
cs.dependency 'Tangram-es', '~> 0.4'
cs.source_files = "src/*.swift"
cs.resources = 'images/*.png'
end
Expand Down