-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from BalestraPatrick/fix-carthage
Make private Cartfile public in order to fix installation via Carthage
- Loading branch information
Showing
5 changed files
with
6 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| github "Quick/Nimble" ~> 7.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,2 @@ | ||
| # Build system configs | ||
| github "jspahrsummers/xcconfigs" == 0.12 | ||
|
|
||
| # Testing tools | ||
| github "Quick/Nimble" ~> 7.0 | ||
| github "Quick/Quick" ~> 1.2 | ||
| github "jspahrsummers/xcconfigs" == 0.12 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| github "Quick/Nimble" "v7.3.1" | ||
| github "Quick/Quick" "v1.3.2" | ||
| github "Quick/Nimble" "v7.3.4" | ||
| github "Quick/Quick" "v1.3.4" | ||
| github "jspahrsummers/xcconfigs" "0.12" |
Submodule Nimble
updated
14 files
| +31 −10 | .travis.yml | |
| +1 −1 | Nimble.podspec | |
| +1 −1 | README.md | |
| +6 −3 | Sources/Nimble/Adapters/NimbleEnvironment.swift | |
| +8 −2 | Sources/Nimble/DSL+Wait.swift | |
| +6 −2 | Sources/Nimble/Matchers/Async.swift | |
| +26 −2 | Sources/Nimble/Matchers/BeIdenticalTo.swift | |
| +1 −2 | Sources/Nimble/Matchers/BeginWith.swift | |
| +80 −92 | Sources/Nimble/Matchers/Equal.swift | |
| +1 −1 | Sources/Nimble/Matchers/Predicate.swift | |
| +1 −1 | Sources/Nimble/Utils/Await.swift | |
| +13 −1 | Sources/Nimble/Utils/Stringers.swift | |
| +5 −0 | Tests/NimbleTests/objc/ObjCAsyncTest.m | |
| +1 −1 | test |
Submodule Quick
updated
3 files
| +1 −1 | [email protected] | |
| +1 −1 | Quick.podspec | |
| +1 −1 | Sources/Quick/Behavior.swift |