Merge pull request #99 from Carthage/update-result-and-nimble

ikesyo · web-flow · commit ef8555ea427c · 2017-03-07T09:13:11.000+09:00
Update Result and Nimble for Swift 3.1 compatibility
diff --git a/.Package.test.swift b/.Package.test.swift
@@ -3,8 +3,8 @@ import PackageDescription
 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: 6),
-        .Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
+        .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6),
+        .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
     ]
 )
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
       env: JOB=Xcode8
     - script:
         - mv .Package.test.swift Package.swift
+        - swift package update
+        - cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
         - SWIFT_GIT=`xcrun --find git` swift build
         - swift test
       os: osx
@@ -27,6 +29,8 @@ matrix:
       env: JOB=SPM
     - script:
         - mv .Package.test.swift Package.swift
+        - swift package update
+        - cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
         - swift build
         - swift test
       env: JOB=Linux
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "antitypical/Result" ~> 3.1
+github "antitypical/Result" ~> 3.2.1
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" ~> 0.9
 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 "antitypical/Result" "3.1.0"
+github "antitypical/Result" "3.2.1"
 github "jspahrsummers/xcconfigs" "0.9"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 8e2703fabde578a6d28537c73844f84d48e71200
+Subproject commit 8116a83864ee78339798c3ef425c42f6ca6bf034
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 2dd1a0c7bca4cc44082f72020fe8b14491056f88
+Subproject commit 2af7c146071c8d8fb3953f19924ecebf15c88ea7
diff --git a/Package.swift b/Package.swift
@@ -3,6 +3,6 @@ import PackageDescription
 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/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
     ]
 )

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