Skip to content

Commit

Permalink
Merge pull request #123 from bustoutsolutions/1.0-rc.2
Browse files Browse the repository at this point in the history
1.0-rc.2
  • Loading branch information
pcantrell authored Oct 7, 2016
2 parents dbc4e9d + a597fa7 commit 45d27d5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Examples/GithubBrowser/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- Siesta/Core (1.0-rc.1)
- Siesta/UI (1.0-rc.1):
- Siesta/Core (1.0-rc.2)
- Siesta/UI (1.0-rc.2):
- Siesta/Core
- SwiftyJSON (2.3.2)

Expand All @@ -21,7 +21,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/BaiduHiDeviOS/SwiftyJSON.git

SPEC CHECKSUMS:
Siesta: 2565851ce35b78507a1b26df68e82e576eb71c6c
Siesta: 2aec41285f1cb1e875389846ba2fc298c2e5d761
SwiftyJSON: 6118fb49d7519c4d31a0c1f3d5af936e9047b556

PODFILE CHECKSUM: 1be9d814355a48187727c0a77f4837db1c72fa65
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,25 +126,25 @@ Siesta requires Swift 3, so make sure you have [Xcode 8](https://developer.apple

In your `Podfile`:

pod 'Siesta', '>=1.0-rc.1'
pod 'Siesta', '>=1.0-rc.2'

(If you use `>=`, make sure CocoaPods downloads the right version. Due to a [bug in CocoaPods](https://github.com/CocoaPods/CocoaPods/issues/5718) fixed only recently, it does not work properly with prerelease version numbers.)

If you want to use the UI helpers:

pod 'Siesta/UI', '>=1.0-rc.1'
pod 'Siesta/UI', '>=1.0-rc.2'

If you want to use Alamofire as your networking provider instead of `NSURLSession`:

pod 'Siesta/Alamofire', '>=1.0-rc.1'
pod 'Siesta/Alamofire', '>=1.0-rc.2'

(You’ll also need to pass an `Alamofire.Manager` when you configure your `Siesta.Service`. See the [API docs](http://bustoutsolutions.github.io/siesta/api/Classes/Service.html#/s:FC6Siesta7ServicecFMS0_FT4baseGSqSS_22useDefaultTransformersSb18networkingProviderPS_18NetworkingProvider__S0_) for more info.)

### Carthage

In your `Cartfile`:

github "bustoutsolutions/siesta" "1.0-rc.1"
github "bustoutsolutions/siesta" "1.0-rc.2"

Follow the [Carthage instructions](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) to add `Siesta.framework` to your project. If you want to use the UI helpers, you will also need to add `SiestaUI.framework` to your project as well.

Expand Down
4 changes: 2 additions & 2 deletions Siesta.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "Siesta"
s.version = "1.0-rc.1"
s.version = "1.0-rc.2"
s.summary = "Swift REST client library"

s.description = <<-DESC
Expand Down Expand Up @@ -69,7 +69,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.11"

s.source = { :git => "https://github.com/bustoutsolutions/siesta.git", :tag => "1.0-rc.1" }
s.source = { :git => "https://github.com/bustoutsolutions/siesta.git", :tag => "1.0-rc.2" }

s.subspec "Core" do |s|
s.source_files = "Source/Siesta/**/*"
Expand Down

0 comments on commit 45d27d5

Please sign in to comment.