Skip to content

Commit

Permalink
Merge pull request #180 from bustoutsolutions/1.1.0
Browse files Browse the repository at this point in the history
1.1.0
  • Loading branch information
pcantrell authored Feb 8, 2017
2 parents a7d19bd + def5697 commit 8029a42
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ branches:

language: objective-c
os: osx
osx_image: xcode8.1
osx_image: xcode8.2
env:
- scheme='Siesta macOS' platform='OS X'
- scheme='Siesta iOS' platform='iOS Simulator' ios_version='10.1' ios_device='iPhone SE'
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ github "Alamofire/Alamofire" ~> 4.0
# Testing

github "pcantrell/Quick" "expose-current-spec-swift3" # fork for Swift 3, use of XCTestExpectation
github "Quick/Nimble" "master"
github "Quick/Nimble"
github "pcantrell/Nocilla" "siesta" # fork adds delay() / go(), nullability annotations
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Alamofire/Alamofire" "4.1.0"
github "Quick/Nimble" "8f08dc9c9757ab31ddf15326cff492f5aab1c17c"
github "Alamofire/Alamofire" "4.3.0"
github "Quick/Nimble" "v6.0.1"
github "pcantrell/Nocilla" "bd7ec7caa0576f08c00bbbf993a9204f93be16e3"
github "pcantrell/Quick" "b0ebe5fb4e07e9b681f4208d8e633fafda973ec0"
github "pcantrell/Quick" "1c2c4056049e52d25fc48171ab62ab9d33821b47"
12 changes: 6 additions & 6 deletions Examples/GithubBrowser/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PODS:
- Siesta/Core (1.0.1)
- Siesta/UI (1.0.1):
- Siesta/Core (1.1.0)
- Siesta/UI (1.1.0):
- Siesta/Core
- SwiftyJSON (3.1.1)
- SwiftyJSON (3.1.4)

DEPENDENCIES:
- Siesta/UI (from `../..`)
Expand All @@ -13,9 +13,9 @@ EXTERNAL SOURCES:
:path: "../.."

SPEC CHECKSUMS:
Siesta: ea9de37bc34a6fc3906479f3f9a317307332a0d7
SwiftyJSON: f0be2e604f83e8405a624e9f891898bf6ed4e019
Siesta: 44209f906276125106ea37f16f1f37019856e514
SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220

PODFILE CHECKSUM: 185541f66e3c53d1269ded59a72f9c99e6a2d105

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

In your `Podfile`:

pod 'Siesta', '>=1.0.1'
pod 'Siesta', '~> 1.0'

If you want to use the UI helpers:

pod 'Siesta/UI', '>=1.0.1'
pod 'Siesta/UI', '~> 1.0'

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

pod 'Siesta/Alamofire', '>=1.0.1'
pod 'Siesta/Alamofire', '~> 1.0'

(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.1"
github "bustoutsolutions/siesta" ~> 1.0

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

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

0 comments on commit 8029a42

Please sign in to comment.