From 5a5c36cdac5a43d4c092407718aadcc8030eed2d Mon Sep 17 00:00:00 2001 From: Paul Cantrell Date: Tue, 7 Feb 2017 20:22:08 -0600 Subject: [PATCH 1/2] Bumped deps --- .travis.yml | 2 +- Cartfile.private | 2 +- Cartfile.resolved | 6 +++--- Examples/GithubBrowser/Podfile.lock | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4eaef71b..f715ed79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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' diff --git a/Cartfile.private b/Cartfile.private index a1b34a3d..7541123f 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -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 diff --git a/Cartfile.resolved b/Cartfile.resolved index 4d2f3f2c..3fc59b36 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -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" diff --git a/Examples/GithubBrowser/Podfile.lock b/Examples/GithubBrowser/Podfile.lock index 867a1aac..14b93a84 100644 --- a/Examples/GithubBrowser/Podfile.lock +++ b/Examples/GithubBrowser/Podfile.lock @@ -2,7 +2,7 @@ PODS: - Siesta/Core (1.0.1) - Siesta/UI (1.0.1): - Siesta/Core - - SwiftyJSON (3.1.1) + - SwiftyJSON (3.1.4) DEPENDENCIES: - Siesta/UI (from `../..`) @@ -14,8 +14,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Siesta: ea9de37bc34a6fc3906479f3f9a317307332a0d7 - SwiftyJSON: f0be2e604f83e8405a624e9f891898bf6ed4e019 + SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220 PODFILE CHECKSUM: 185541f66e3c53d1269ded59a72f9c99e6a2d105 -COCOAPODS: 1.2.0.beta.1 +COCOAPODS: 1.2.0 From def5697da1375917090f0f0cd1fed7f7a1fe7f16 Mon Sep 17 00:00:00 2001 From: Paul Cantrell Date: Tue, 7 Feb 2017 21:40:09 -0600 Subject: [PATCH 2/2] 1.1.0 Also changed to ~> version specs in README examples --- Examples/GithubBrowser/Podfile.lock | 6 +++--- README.md | 8 ++++---- Siesta.podspec | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Examples/GithubBrowser/Podfile.lock b/Examples/GithubBrowser/Podfile.lock index 14b93a84..28cbae57 100644 --- a/Examples/GithubBrowser/Podfile.lock +++ b/Examples/GithubBrowser/Podfile.lock @@ -1,6 +1,6 @@ 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.4) @@ -13,7 +13,7 @@ EXTERNAL SOURCES: :path: "../.." SPEC CHECKSUMS: - Siesta: ea9de37bc34a6fc3906479f3f9a317307332a0d7 + Siesta: 44209f906276125106ea37f16f1f37019856e514 SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220 PODFILE CHECKSUM: 185541f66e3c53d1269ded59a72f9c99e6a2d105 diff --git a/README.md b/README.md index 879b055e..7c7db1bb 100644 --- a/README.md +++ b/README.md @@ -124,15 +124,15 @@ 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.) @@ -140,7 +140,7 @@ If you want to use Alamofire as your networking provider instead of Foundation 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. diff --git a/Siesta.podspec b/Siesta.podspec index 3c2d5409..652b9899 100644 --- a/Siesta.podspec +++ b/Siesta.podspec @@ -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 @@ -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/**/*"