Skip to content

Commit

Permalink
Merge pull request #142 from bustoutsolutions/1.0-rc.3
Browse files Browse the repository at this point in the history
1.0-rc.3
  • Loading branch information
pcantrell authored Nov 8, 2016
2 parents 4771719 + 7376d5a commit 3fe1a82
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Alamofire/Alamofire" "4.0.1"
github "Quick/Nimble" "8b71ca345b9b41e3555f87dd904c6f23e4ccdc34"
github "Quick/Nimble" "b9fec55a7c82ffc44a3349e1b6481c0cb3cfa2a2"
github "pcantrell/Nocilla" "bd7ec7caa0576f08c00bbbf993a9204f93be16e3"
github "pcantrell/Quick" "b0ebe5fb4e07e9b681f4208d8e633fafda973ec0"
2 changes: 1 addition & 1 deletion Examples/GithubBrowser/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ target 'GithubBrowser' do
use_frameworks!

pod 'Siesta/UI', path: '../..'
pod 'SwiftyJSON', git: 'https://github.com/BaiduHiDeviOS/SwiftyJSON.git', branch: 'swift3'
pod 'SwiftyJSON'
end
24 changes: 8 additions & 16 deletions Examples/GithubBrowser/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
PODS:
- Siesta/Core (1.0-rc.2)
- Siesta/UI (1.0-rc.2):
- Siesta/Core (1.0-rc.3)
- Siesta/UI (1.0-rc.3):
- Siesta/Core
- SwiftyJSON (2.3.2)
- SwiftyJSON (3.1.1)

DEPENDENCIES:
- Siesta/UI (from `../..`)
- SwiftyJSON (from `https://github.com/BaiduHiDeviOS/SwiftyJSON.git`, branch `swift3`)
- SwiftyJSON

EXTERNAL SOURCES:
Siesta:
:path: "../.."
SwiftyJSON:
:branch: swift3
:git: https://github.com/BaiduHiDeviOS/SwiftyJSON.git

CHECKOUT OPTIONS:
SwiftyJSON:
:commit: de5dc3b1b421805769590d331178551bbb0e5733
:git: https://github.com/BaiduHiDeviOS/SwiftyJSON.git

SPEC CHECKSUMS:
Siesta: 2aec41285f1cb1e875389846ba2fc298c2e5d761
SwiftyJSON: 6118fb49d7519c4d31a0c1f3d5af936e9047b556
Siesta: 958929f3ac15c58919ba90e06995c4e313f69340
SwiftyJSON: f0be2e604f83e8405a624e9f891898bf6ed4e019

PODFILE CHECKSUM: 1be9d814355a48187727c0a77f4837db1c72fa65
PODFILE CHECKSUM: 185541f66e3c53d1269ded59a72f9c99e6a2d105

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

In your `Podfile`:

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

(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.2'
pod 'Siesta/UI', '>=1.0-rc.3'

If you want to use Alamofire as your networking provider instead of Foundation’s `URLSession`:

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

(You’ll also need to pass an `Alamofire.Manager` when you configure your `Siesta.Service`. See the [API docs](https://bustoutsolutions.github.io/siesta/api/Classes/Service.html#//apple_ref/swift/Method/init(baseURL:useDefaultTransformers:networking:)) for more info.)

### Carthage

In your `Cartfile`:

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

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.2"
s.version = "1.0-rc.3"
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.2" }
s.source = { :git => "https://github.com/bustoutsolutions/siesta.git", :tag => "1.0-rc.3" }

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

0 comments on commit 3fe1a82

Please sign in to comment.