Merge pull request #332 from typelift/swift-develop

Update to Swift 4

.gitignore

@@ -23,3 +23,7 @@ DerivedData
 Carthage/Build
 Carthage/Checkouts
 
+# Docker
+.dockerignore
+Dockerfile
+

.gitmodules

@@ -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

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       before_install:
         - git submodule update --init --recursive
       script:
@@ -14,15 +14,15 @@ matrix:
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       before_install:
         - git submodule update --init --recursive
       script:
         - set -o pipefail
         - xcodebuild test -scheme Swiftz | xcpretty -c
         # !!!: Make sure desired device name & OS version are suitable for the Xcode version installed on osx_image
-        - iOS_DEVICE_NAME="iPad Pro (12.9 inch)"
-        - iOS_RUNTIME_VERSION="10.0"
+        - iOS_DEVICE_NAME="iPad Pro (12.9-inch) (2nd generation)"
+        - iOS_RUNTIME_VERSION="11.0"
         # Get simulator identifier for desired device/runtime pair
         - SIMULATOR_ID=$(xcrun instruments -s | grep -o "${iOS_DEVICE_NAME} (${iOS_RUNTIME_VERSION}) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
         - echo $SIMULATOR_ID
@@ -37,11 +37,11 @@ matrix:
       before_install:
         - git submodule update --init --recursive
         - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-        - wget https://swift.org/builds/swift-3.1-release/ubuntu1404/swift-3.1-RELEASE/swift-3.1-RELEASE-ubuntu14.04.tar.gz 
-        - tar xzf swift-3.1-RELEASE-ubuntu14.04.tar.gz 
-        - export PATH=${PWD}/swift-3.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}" 
+        - wget https://swift.org/builds/swift-4.0-release/ubuntu1404/swift-4.0-RELEASE/swift-4.0-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-4.0-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-4.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
       script:
-        - swift build
+        - swift test
 notifications:
   webhooks:
     urls:

Cartfile.private

@@ -1,4 +1,3 @@
-github "typelift/Swiftx" 
+github "typelift/Swiftx"
 github "typelift/SwiftCheck"
 github "typelift/Operadics"
-

Cartfile.resolved

@@ -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"

Package.swift

@@ -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"]),
+		]
 )
 

README.md

@@ -137,10 +137,23 @@ To add Swiftz to your application:
 
 **Using Swift Package Manager**
 
-- Add Swiftz to your `Package.swift` file's `dependencies` section:
+- Add Swiftz to your `Package.swift` within your project's `Package` definition:
 
 ```swift
-.Package(url: "https://github.com/typelift/Swiftz", versions: Version(0,6,0)..<Version(1,0,0))
+let package = Package(
+	name: "MyProject",
+	...
+	dependencies: [
+		.package(url: "https://github.com/typelift/Swiftz.git", from: "0.0.0")
+		...
+	],
+	targets: [
+		.target(
+            name: "MyProject",
+            dependencies: ["Swiftz"]),
+        ...
+	]
+)
 ```
 
 System Requirements