Merge pull request #92 from Carthage/update-nimble

mdiep · web-flow · commit ad81078a529a · 2017-03-06T13:33:58.000-05:00
Update Nimble to be built with Swift 3.1
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
       osx_image: xcode8.2
       script:
         - mv .Package.test.swift Package.swift
+        - swift package update
+        - cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
         - swift build
         - swift test
       env: JOB=SWIFTPM_DARWIN
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
 github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" ~> 6.0
+github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v6.0.1"
+github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
 github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveSwift" "1.1.0"
 github "antitypical/Result" "3.2.0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 8e2703fabde578a6d28537c73844f84d48e71200
+Subproject commit 8116a83864ee78339798c3ef425c42f6ca6bf034

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-github "Quick/Nimble" "v6.0.1"`
	`1`	`+github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"`
`2`	`2`	`github "Quick/Quick" "v1.1.0"`
`3`	`3`	`github "ReactiveCocoa/ReactiveSwift" "1.1.0"`
`4`	`4`	`github "antitypical/Result" "3.2.0"`