Merge pull request #101 from Carthage/update-quick-and-nimble

ikesyo · web-flow · commit 7187045d9707 · 2017-10-25T13:55:51.000+09:00
Update Quick and Nimble
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" ~> 7.0.1
+github "Quick/Quick" ~> 1.2
+github "Quick/Nimble" ~> 7.0.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v7.0.1"
-github "Quick/Quick" "v1.1.0"
+github "Quick/Nimble" "v7.0.2"
+github "Quick/Quick" "v1.2.0"
 github "ReactiveCocoa/ReactiveSwift" "2.0.1"
 github "antitypical/Result" "3.2.3"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 39b67002306fda9de4c9fd1290a6295f97edd09e
+Subproject commit 38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit e4fa1e85c0305ba4e0866f25812d3fa398f3a048
+Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         ]
         if isSwiftPackagerManagerTest {
             deps += [
-                .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
+                .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 2),
                 .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7),
             ]
         }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ let package = Package(`
`14`	`14`	`]`
`15`	`15`	`if isSwiftPackagerManagerTest {`
`16`	`16`	`deps += [`
`17`		`- .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),`
	`17`	`+ .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 2),`
`18`	`18`	`.Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7),`
`19`	`19`	`]`
`20`	`20`	`}`