-
Notifications
You must be signed in to change notification settings - Fork 233
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 #332 from typelift/swift-develop
Update to Swift 4
- Loading branch information
Showing
80 changed files
with
1,661 additions
and
1,333 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 |
---|---|---|
|
@@ -23,3 +23,7 @@ DerivedData | |
Carthage/Build | ||
Carthage/Checkouts | ||
|
||
# Docker | ||
.dockerignore | ||
Dockerfile | ||
|
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,9 +1,12 @@ | ||
[submodule "Carthage/Checkouts/Swiftx"] | ||
path = Carthage/Checkouts/Swiftx | ||
url = https://github.com/typelift/Swiftx.git | ||
[submodule "Carthage/Checkouts/SwiftCheck"] | ||
path = Carthage/Checkouts/SwiftCheck | ||
url = https://github.com/typelift/SwiftCheck.git | ||
path = Carthage/Checkouts/Swiftx | ||
[submodule "Carthage/Checkouts/FileCheck"] | ||
path = Carthage/Checkouts/FileCheck | ||
url = https://github.com/trill-lang/FileCheck.git | ||
[submodule "Carthage/Checkouts/Operadics"] | ||
path = Carthage/Checkouts/Operadics | ||
url = https://github.com/typelift/Operadics.git | ||
[submodule "Carthage/Checkouts/SwiftCheck"] | ||
path = Carthage/Checkouts/SwiftCheck | ||
url = https://github.com/typelift/SwiftCheck.git |
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,4 +1,3 @@ | ||
github "typelift/Swiftx" | ||
github "typelift/Swiftx" | ||
github "typelift/SwiftCheck" | ||
github "typelift/Operadics" | ||
|
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,4 @@ | ||
github "typelift/Operadics" "0.2.2" | ||
github "typelift/SwiftCheck" "0.8.0" | ||
github "typelift/Swiftx" "0.5.2" | ||
github "trill-lang/FileCheck" "0.0.4" | ||
github "typelift/Operadics" "0.3.0" | ||
github "typelift/SwiftCheck" "0.9.1" | ||
github "typelift/Swiftx" "0.6.0" |
Submodule Operadics
updated
4 files
+1 −0 | .gitignore | |
+11 −4 | Package.swift | |
+4 −4 | README.md | |
+0 −0 | Sources/Operadics/Operators.swift |
Submodule SwiftCheck
updated
53 files
Submodule Swiftx
updated
21 files
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,13 +1,25 @@ | ||
// swift-tools-version:4.0 | ||
|
||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "Swiftz", | ||
targets: [ | ||
Target(name: "Swiftz") | ||
], | ||
products: [ | ||
.library( | ||
name: "Swiftz", | ||
targets: ["Swiftz"]), | ||
], | ||
dependencies: [ | ||
.Package(url: "https://github.com/typelift/Operadics.git", versions: Version(0,2,2)...Version(0,2,2)), | ||
.Package(url: "https://github.com/typelift/Swiftx.git", versions: Version(0,5,1)...Version(0,5,1)), | ||
] | ||
.package(url: "https://github.com/typelift/Swiftx.git", from: "0.6.0"), | ||
.package(url: "https://github.com/typelift/SwiftCheck.git", from: "0.9.0") | ||
], | ||
targets: [ | ||
.target( | ||
name: "Swiftz", | ||
dependencies: ["Swiftx"]), | ||
.testTarget( | ||
name: "SwiftzTests", | ||
dependencies: ["Swiftz", "SwiftCheck"]), | ||
] | ||
) | ||
|
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.