forked from Carthage/Carthage
-
Notifications
You must be signed in to change notification settings - Fork 0
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 Carthage#69 from norio-nomura/nn-swift-3
Support Swift 3.0
- Loading branch information
Showing
26 changed files
with
305 additions
and
330 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 |
---|---|---|
@@ -1 +1 @@ | ||
DEVELOPMENT-SNAPSHOT-2016-03-24-a | ||
3.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
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 +1 @@ | ||
github "antitypical/Result" ~> 2.1.3 | ||
github "antitypical/Result" ~> 3.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,3 +1,3 @@ | ||
github "jspahrsummers/xcconfigs" ~> 0.9 | ||
github "Quick/Quick" ~> 0.9.3 | ||
github "Quick/Nimble" "188caeb" | ||
github "Quick/Quick" "swift-3.0" | ||
github "Quick/Nimble" "master" |
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,4 +1,4 @@ | ||
github "Quick/Nimble" "188caeb094bc342614d8a5c706cd8bb9a6c355eb" | ||
github "Quick/Quick" "v0.9.3" | ||
github "antitypical/Result" "2.1.3" | ||
github "Quick/Nimble" "fcc28b23f57b30382e5f182c238674694d7174cb" | ||
github "Quick/Quick" "8f2bc636ecfa2cc20696f62548b38d4ab943e299" | ||
github "antitypical/Result" "3.0.0" | ||
github "jspahrsummers/xcconfigs" "0.9" |
Submodule Result
updated
11 files
+1 −1 | .swift-version | |
+11 −19 | .travis.yml | |
+2 −2 | Result.podspec | |
+51 −25 | Result.xcodeproj/project.pbxproj | |
+1 −1 | Result/Info.plist | |
+48 −123 | Result/Result.swift | |
+182 −0 | Result/ResultProtocol.swift | |
+0 −264 | Result/ResultType.swift | |
+1 −1 | Tests/LinuxMain.swift | |
+1 −1 | Tests/ResultTests/Info.plist | |
+35 −52 | Tests/ResultTests/ResultTests.swift |
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
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,8 +1,18 @@ | ||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "Commandant", | ||
dependencies: [ | ||
.Package(url: "https://github.com/antitypical/Result.git", "2.0.0") | ||
] | ||
name: "Commandant", | ||
dependencies: { | ||
#if os(macOS) | ||
return [ | ||
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3, minor: 0), | ||
] | ||
#else | ||
return [ | ||
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3, minor: 0), | ||
.Package(url: "https://github.com/ikesyo/Nimble", "5.0.0-alpha.30"), | ||
.Package(url: "https://github.com/norio-nomura/Quick", "0.10.0-alpha.30.gm.candidate"), | ||
] | ||
#endif | ||
}() | ||
) |
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
Oops, something went wrong.