Skip to content

Commit

Permalink
Update Nimble to be built with Swift 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ikesyo committed Mar 6, 2017
1 parent 3487f19 commit 358858b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -66,6 +66,8 @@ matrix:
- JOB=PODSPEC
- script:
- mv .Package.test.swift Package.swift
- swift package update
- cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
- swift build
- swift test
env:
Expand All @@ -78,6 +80,8 @@ matrix:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
script:
- mv .Package.test.swift Package.swift
- swift package update
- cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
- swift build
- swift test
env: JOB=SWIFTPM_LINUX
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.private
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" "3d9d996"
github "Quick/Quick" ~> 1.1
github "Quick/Nimble" ~> 6.0.1
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
2 changes: 1 addition & 1 deletion 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.2.1"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 22 files
+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

0 comments on commit 358858b

Please sign in to comment.