Update to Swift 4.0

CodaFi · CodaFi · commit aa2f0626fb79 · 2017-11-01T22:48:16.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .DS_Store
 .build/*
 Packages/*
+Package.resolved
 build/*
 *.pbxuser
 !default.pbxuser
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "Carthage/Checkouts/Operadics"]
 	path = Carthage/Checkouts/Operadics
 	url = https://github.com/typelift/Operadics.git
+[submodule "Carthage/Checkouts/FileCheck"]
+	path = Carthage/Checkouts/FileCheck
+	url = https://github.com/trill-lang/FileCheck.git
diff --git a/.travis.yml b/.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,7 +14,7 @@ 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:
@@ -39,11 +39,10 @@ matrix:
       sudo: required
       dist: trusty
       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
 notifications:
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,3 @@
-github "typelift/Operadics" "0.2.2"
-github "typelift/SwiftCheck" "0.8.0"
+github "trill-lang/FileCheck" "0.0.4"
+github "typelift/Operadics" "0.3.0"
+github "typelift/SwiftCheck" "0.9.1"
diff --git a/Carthage/Checkouts/FileCheck b/Carthage/Checkouts/FileCheck
@@ -0,0 +1 @@
+Subproject commit 083073480112406580f0242036a079f9f8b170ad
diff --git a/Carthage/Checkouts/Operadics b/Carthage/Checkouts/Operadics
@@ -1 +1 @@
-Subproject commit fcacc621d00449c2cc0cb7227756928566370d28
+Subproject commit c2a14919b3653a39a9bf268c1ae0bf71ad6833fe
diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck
@@ -1 +1 @@
-Subproject commit 97a244b4c48e5823e82f50562fc4e32b3d6507a8
+Subproject commit df82fb889864945c64458f38846702af729b3ee4
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,25 @@
+// swift-tools-version:4.0
+
 import PackageDescription
 
 let package = Package(
-	name: "Swiftx",
-	targets: [
-		Target(name: "Swiftx"),
-	],
-	dependencies: [
-		.Package(url: "https://github.com/typelift/Operadics.git", majorVersion: 0)
-	]
+  name: "Swiftx",
+  products: [
+    .library(
+      name: "Swiftx",
+      targets: ["Swiftx"]),
+    ],
+  dependencies: [
+    .package(url: "https://github.com/typelift/Operadics.git", from: "0.3.0"),
+    .package(url: "https://github.com/typelift/SwiftCheck.git", from: "0.9.0"),
+  ],
+  targets: [
+    .target(
+      name: "Swiftx",
+      dependencies: ["Operadics"]),
+    .testTarget(
+      name: "SwiftxTests",
+      dependencies: ["Swiftx", "Operadics", "SwiftCheck"]),
+    ]
 )
 
diff --git a/Sources/Swiftx/Array.swift b/Sources/Swiftx/Array.swift
diff --git a/Sources/Swiftx/Combinators.swift b/Sources/Swiftx/Combinators.swift
diff --git a/Sources/Swiftx/Either.swift b/Sources/Swiftx/Either.swift
diff --git a/Sources/Swiftx/Error.swift b/Sources/Swiftx/Error.swift
diff --git a/Sources/Swiftx/Optional.swift b/Sources/Swiftx/Optional.swift
diff --git a/Swiftx.xcodeproj/project.pbxproj b/Swiftx.xcodeproj/project.pbxproj
diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -69,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-tvOS.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-watchOS.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/SwiftxTests.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/SwiftxTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Tests/SwiftxTests/EitherSpec.swift b/Tests/SwiftxTests/EitherSpec.swift
@@ -9,6 +9,9 @@
 import Swiftx
 import XCTest
 import SwiftCheck
+#if SWIFT_PACKAGE
+import Operadics
+#endif
 
 extension Either where L : Arbitrary, R : Arbitrary {
 	static var arbitrary : Gen<Either<L, R>> {
