Merge pull request #341 from CodaFi/touch-up

Update to Swift 5

Author: CodaFi

.swift-version

@@ -1 +1 @@
-4.0
+5.0

.travis.yml

@@ -5,16 +5,15 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode9.3
+      osx_image: xcode10.2
       before_install:
         - git submodule update --init --recursive
       script:
-      # Restore pod build before shipping for 3.0 
-      # - pod lib lint
+        - pod lib lint
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode9.3
+      osx_image: xcode10.2
       before_install:
         - git submodule update --init --recursive
       script:
@@ -31,9 +30,9 @@ 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-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz
-        - tar xzf swift-4.1-RELEASE-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-4.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
+        - wget https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-5.0-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-5.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
       script:
         - swift test
 notifications:

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "typelift/Operadics" "0.3.0"
-github "typelift/SwiftCheck" "0.10.0"
-github "typelift/Swiftx" "0.7.0"
+github "typelift/Operadics" "0.4.0"
+github "typelift/SwiftCheck" "0.12.0"
+github "typelift/Swiftx" "0.8.0"

Carthage/Checkouts/Operadics

@@ -118,10 +118,14 @@ extension Function /*: ArrowApply*/ {
 	}
 }
 
+/*
+FIXME: This cannot work with strictness.
 extension Function /*: ArrowLoop*/ {
 	public typealias LOOP = Function<(A, D), (B, D)>
 
 	public static func loop<B, C>(_ f : Function<(B, D), (C, D)>) -> Function<B, C> {
 		return Function<B, C>.arr(Function.loop(f).apply)
 	}
 }
+*/
+

Carthage/Checkouts/SwiftCheck

@@ -437,12 +437,6 @@ public struct List<Element> {
 		return (snd • ev) <^> self.find({ ev($0).0 == key })
 	}
 
-	/// Returns a List of an infinite number of iteratations of applications of 
-	/// a function to an initial value.
-	public static func iterate(_ f : @escaping (Element) -> Element, initial : Element) -> List<Element> {
-		return List(initial, self.iterate(f, initial: f(initial)))
-	}
-
 	/// Cycles a finite list into an infinite list.
 	public func cycle() -> List<Element> {
 		let (hd, tl) = self.next()

Carthage/Checkouts/Swiftx

@@ -178,10 +178,10 @@ extension Optional /*: Foldable*/ {
 }
 
 extension Optional : Sequence {
-	public typealias Iterator = IteratorOverOne<Wrapped>
+	public typealias Iterator = CollectionOfOne<Wrapped>.Iterator
 
-	public func makeIterator() -> IteratorOverOne<Wrapped> {
-		return IteratorOverOne(_elements: self)
+	public func makeIterator() -> CollectionOfOne<Wrapped>.Iterator {
+		return CollectionOfOne.Iterator(_elements: self)
 	}
 }
 

Sources/Swiftz/Function.swift

@@ -52,9 +52,7 @@ public func >(l : Unit, r : Unit) -> Bool {
 }
 
 extension Unit : Hashable {
-	public var hashValue : Int {
-		return 0
-	}
+	public func hash(into hasher: inout Hasher) { }
 }
 
 extension Unit : Monoid {