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

Update Result and Nimble for Swift 3.1 compatibility
Carthage · Mar 7, 2017 · ef8555e · ef8555e
2 parents 09d6b9c + e1ebd6d
commit ef8555e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
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
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
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
		@@ -1 +1 @@
		github "antitypical/Result" ~> 3.1
		github "antitypical/Result" ~> 3.2.1
+1 −1		Gemfile
+25 −21		Gemfile.lock
+18 −14		Nimble.xcodeproj/project.pbxproj
+14 −9		README.md
+2 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.h
+2 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.m
+9 −4		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.swift
+19 −6		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift
+0 −50		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m
+6 −1		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+77 −66		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift
+28 −36		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+16 −2		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlMachBadInstructionHandler.h
+49 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlMachBadInstructionHandler.m
+20 −23		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Info.plist
+4 −4		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.c
+23 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h
+5 −5		Sources/Nimble/DSL+Wait.swift
+2 −2		Sources/Nimble/FailureMessage.swift
+1 −1		Sources/Nimble/Nimble.h
+1 −1		Sources/Nimble/Utils/Async.swift
+1 −1		Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+11 −0		.travis.yml
+1 −2		Result.podspec
+0 −109		Result.xcodeproj/project.pbxproj
+1 −1		Result/Info.plist
+36 −2		Result/Result.swift
+19 −1		Result/ResultProtocol.swift
+1 −1		Tests/ResultTests/Info.plist
+84 −23		Tests/ResultTests/ResultTests.swift