From 255f28cfac7482541428a79aabad598f7bca9cb4 Mon Sep 17 00:00:00 2001 From: Yoichi Tagaya Date: Sat, 10 Dec 2016 21:58:22 +0900 Subject: [PATCH 1/2] Update Swinject to 2.0.0-beta.3, and Quick and Nimble to Swift 3 version by Carthage. --- Cartfile | 2 +- Cartfile.private | 4 ++-- Cartfile.resolved | 6 +++--- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/Swinject | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cartfile b/Cartfile index f53eed3..9596a3b 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "Swinject/Swinject" "c088d36d3b6082cd07176c19f3e1e9518b240c8c" +github "Swinject/Swinject" "2.0.0-beta.3" diff --git a/Cartfile.private b/Cartfile.private index 65f3ef1..f4cac76 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650" -github "Quick/Quick" "81d2a7bd95ef91e2604ee0431bba6fe59ad662dc" -github "Quick/Nimble" "220152be528dcc0537764c179c95b8174028c80c" +github "Quick/Quick" ~> 1.0 +github "Quick/Nimble" ~> 5.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5ef0c84..1e5cc63 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "220152be528dcc0537764c179c95b8174028c80c" -github "Quick/Quick" "81d2a7bd95ef91e2604ee0431bba6fe59ad662dc" -github "Swinject/Swinject" "c088d36d3b6082cd07176c19f3e1e9518b240c8c" +github "Quick/Nimble" "v5.1.1" +github "Quick/Quick" "v1.0.0" +github "Swinject/Swinject" "2.0.0-beta.3" github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 220152b..3720e6b 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 220152be528dcc0537764c179c95b8174028c80c +Subproject commit 3720e6b0f6de6d6435f79f8a174fb4bb92df5dc4 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 81d2a7b..9c03231 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 81d2a7bd95ef91e2604ee0431bba6fe59ad662dc +Subproject commit 9c032315fafca658668d49f6396f1f24b09a83b2 diff --git a/Carthage/Checkouts/Swinject b/Carthage/Checkouts/Swinject index c088d36..5ce94de 160000 --- a/Carthage/Checkouts/Swinject +++ b/Carthage/Checkouts/Swinject @@ -1 +1 @@ -Subproject commit c088d36d3b6082cd07176c19f3e1e9518b240c8c +Subproject commit 5ce94decff79b9eab51e88b61951a81130c2388b From 03f8ba466393fec4ebd502099ab85ce195f2c0c4 Mon Sep 17 00:00:00 2001 From: Yoichi Tagaya Date: Sat, 10 Dec 2016 21:59:04 +0900 Subject: [PATCH 2/2] Fix a protocol name renamed in Swinject 2.0.0-beta.3. --- Sources/SwinjectStoryboardOption.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SwinjectStoryboardOption.swift b/Sources/SwinjectStoryboardOption.swift index da44ba4..f98f5dd 100644 --- a/Sources/SwinjectStoryboardOption.swift +++ b/Sources/SwinjectStoryboardOption.swift @@ -9,14 +9,14 @@ import Swinject #if os(iOS) || os(OSX) || os(tvOS) -internal struct SwinjectStoryboardOption: ServiceKeyOptionType { +internal struct SwinjectStoryboardOption: ServiceKeyOption { internal let controllerType: String internal init(controllerType: Container.Controller.Type) { self.controllerType = String(reflecting: controllerType) } - internal func isEqualTo(_ another: ServiceKeyOptionType) -> Bool { + internal func isEqualTo(_ another: ServiceKeyOption) -> Bool { guard let another = another as? SwinjectStoryboardOption else { return false }