Skip to content

Update Nimble to 6.1.0 #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2017
Merged

Update Nimble to 6.1.0 #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .Package.test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ let package = Package(
dependencies: [
.Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
.Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6),
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6, minor: 1),
]
)
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ 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 @@ -80,8 +78,6 @@ 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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" "3d9d996"
github "Quick/Quick" ~> 1.1
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
github "Quick/Nimble" ~> 6.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
github "Quick/Nimble" "v6.1.0"
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
Open in desktop
Submodule Nimble updated 31 files
+3 −0 .swiftlint.yml
+3 −0 Dockerfile.test
+7 −5 Nimble.podspec
+188 −104 Nimble.xcodeproj/project.pbxproj
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+0 −3 Sources/Lib/CwlPreconditionTesting/CwlCatchException/.gitignore
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift
+0 −28 Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/Info.plist
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/CwlCatchException.m
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/include/CwlCatchException.h
+2 −1 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m
+0 −5 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h
+2 −2 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/mach_excServer.c
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/mach_excServer.h
+11 −11 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift
+23 −22 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+14 −17 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift
+5 −5 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+0 −25 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Info.plist
+30 −0 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h
+27 −0 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Posix/CwlPreconditionTesting.h
+1 −6 Sources/Nimble/Nimble.h
+1 −5 Sources/Nimble/Utils/Errors.swift
+2 −0 Sources/NimbleObjectiveC/DSL.h
+4 −0 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+3 −0 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+2 −0 Tests/NimbleTests/objc/ObjCBeGreaterThanOrEqualToTest.m
+1 −0 Tests/NimbleTests/objc/ObjCBeGreaterThanTest.m
+21 −8 test