Skip to content

Commit

Permalink
Merge branch 'Cocoapods-integration'
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelmor committed Feb 27, 2015
2 parents 8bbe57f + 1d8f642 commit adae8ad
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Polyline.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "Polyline"
s.version = "1.0.1"
s.version = "1.0.2"
s.summary = "Polyline encoder / decoder in swift"

s.description = <<-DESC
Expand Down Expand Up @@ -68,7 +68,7 @@ Pod::Spec.new do |s|
# Supports git, hg, bzr, svn and HTTP.
#

s.source = { :git => "https://github.com/raphaelmor/Polyline.git", :tag => "v1.0.1" }
s.source = { :git => "https://github.com/raphaelmor/Polyline.git", :tag => "v1.0.2" }


# ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
Expand Down Expand Up @@ -117,7 +117,7 @@ Pod::Spec.new do |s|
# where they will only apply to your library. If you depend on other Podspecs
# you can include multiple dependencies to ensure it works.

# s.requires_arc = true
s.requires_arc = true

# s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
# s.dependency "JSONKit", "~> 1.4"
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Polyline encoder / decoder in Swift
- 100% Unit Test Coverage
- Complete Documentation
- Continuous integration with [Travis CI](http://travis-ci.org)
- CocoaPod available

### Planned for future releases

Expand All @@ -35,8 +36,6 @@ Polyline encoder / decoder in Swift
- Filter locations available at a specific level

### Planned when support is available :

- Distribute as a [CocoaPod](http://cocoapods.org)
- Code Coverage with [Coveralls](https://coveralls.io)


Expand All @@ -49,10 +48,17 @@ Polyline encoder / decoder in Swift


## Integration
CocoaPods is not fully supported for Swift yet. To use this library in your project you can use Carthage, and/or integrate it manually :
To use this library in your project you can use CocoaPods, Carthage, and/or integrate it manually :

### CocoaPods (Beta)
You can integrate Polyline in your `Podfile` like this:

```
pod 'Polyline', '~> 1.0'
```

### Carthage
You can integrate Polyline in your Cartfile like this :
You can integrate Polyline in your `Cartfile` like this:

```
github "raphaelmor/Polyline" ~> 1.0.0
Expand Down

0 comments on commit adae8ad

Please sign in to comment.