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

mdiep · web-flow · commit 09d6b9c91025 · 2017-02-09T11:14:08.000-05:00
Update Quick and Nimble
diff --git a/.Package.test.swift b/.Package.test.swift
@@ -4,7 +4,7 @@ let package = Package(
     name: "Commandant",
     dependencies: [
         .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 1, 0)..<Version(3, .max, .max)),
-        .Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1),
-        .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
+        .Package(url: "https://github.com/Quick/Nimble", majorVersion: 6),
+        .Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),
     ]
 )
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,10 @@ matrix:
       osx_image: xcode8.2
       language: objective-c
       env: JOB=Xcode8
-    - script: SWIFT_GIT=`xcrun --find git` swift build
+    - script:
+        - mv .Package.test.swift Package.swift
+        - SWIFT_GIT=`xcrun --find git` swift build
+        - swift test
       os: osx
       osx_image: xcode8.2
       language: objective-c
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" ~> 0.9
-github "Quick/Quick" ~> 1.0
-github "Quick/Nimble" ~> 5.1
+github "Quick/Quick" ~> 1.1
+github "Quick/Nimble" ~> 6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v5.1.1"
-github "Quick/Quick" "v1.0.0"
+github "Quick/Nimble" "v6.0.1"
+github "Quick/Quick" "v1.1.0"
 github "antitypical/Result" "3.1.0"
 github "jspahrsummers/xcconfigs" "0.9"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 3720e6b0f6de6d6435f79f8a174fb4bb92df5dc4
+Subproject commit 8e2703fabde578a6d28537c73844f84d48e71200
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 9c032315fafca658668d49f6396f1f24b09a83b2
+Subproject commit e4fa1e85c0305ba4e0866f25812d3fa398f3a048

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ let package = Package(`
`4`	`4`	`name: "Commandant",`
`5`	`5`	`dependencies: [`
`6`	`6`	`.Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 1, 0)..<Version(3, .max, .max)),`
`7`		`- .Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1),`
`8`		`- .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),`
	`7`	`+ .Package(url: "https://github.com/Quick/Nimble", majorVersion: 6),`
	`8`	`+ .Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),`
`9`	`9`	`]`
`10`	`10`	`)`