Merge pull request #337 from CodaFi/bump

CodaFi · web-flow · commit 556236ad2d7c · 2018-04-22T09:15:25.000-04:00
Update to Swift 4.1
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.3
       before_install:
         - git submodule update --init --recursive
       script:
@@ -14,32 +14,26 @@ matrix:
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.3
       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) (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
-        - echo $iOS_DEVICE_NAME
-        - echo $iOS_RUNTIME_VERSION
-        - xcodebuild test -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=${iOS_DEVICE_NAME},OS=${iOS_RUNTIME_VERSION}" | xcpretty -c
-        - xcodebuild test -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
+        - xcodebuild build-for-testing -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c
+        - xcodebuild test -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c
+        - xcodebuild build-for-testing -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c
+        - xcodebuild test -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c
     - os: linux
       language: generic
       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-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}"
+        - 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}"
       script:
         - swift test
 notifications:
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,3 @@
-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"
+github "typelift/SwiftCheck" "0.10.0"
+github "typelift/Swiftx" "0.7.0"
diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck
@@ -1 +1 @@
-Subproject commit df82fb889864945c64458f38846702af729b3ee4
+Subproject commit 43ffe7ab48366c36a697c54bcdd257876edd6fc6
diff --git a/Carthage/Checkouts/Swiftx b/Carthage/Checkouts/Swiftx
@@ -1 +1 @@
-Subproject commit 140f1510ecb8597970c58c5a41a32bda72310d31
+Subproject commit 7c1d3e4bd0db0fd09623e12b2f5863db9f37becb
diff --git a/Sources/Swiftz/ArrayExt.swift b/Sources/Swiftz/ArrayExt.swift
@@ -446,7 +446,7 @@ extension Sequence {
 	/// a (Key, Value) pair for the dictionary, if nil is returned then the value is
 	/// not added to the dictionary.
 	public func mapAssociate<Key, Value>(_ f : (Iterator.Element) -> (Key, Value)?) -> [Key : Value] {
-		return Dictionary(flatMap(f))
+		return Dictionary(compactMap(f))
 	}
 	
 	/// Creates a dictionary of Key-Value pairs generated from the transformer function returning the key (the label)
diff --git a/Swiftz.xcodeproj/project.pbxproj b/Swiftz.xcodeproj/project.pbxproj
@@ -869,7 +869,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = TypeLift;
 				TargetAttributes = {
 					8240CD1B1C3A395F00EF4D29 = {
@@ -1497,12 +1497,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1553,12 +1555,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/Swiftz.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Swiftz.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-iOS.xcscheme b/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-tvOS.xcscheme b/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-watchOS.xcscheme b/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz.xcscheme b/Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Tests/SwiftzTests/ArrayExtSpec.swift b/Tests/SwiftzTests/ArrayExtSpec.swift
@@ -17,8 +17,8 @@ import SwiftCheck
 
 class ArrayExtSpec : XCTestCase {
 	func testProperties() {
-		property("mapFlatten is the same as removing the optionals from an array and forcing") <- forAll { (xs0 : Array<OptionalOf<Int>>) in
-			return mapFlatten(xs0.map({ $0.getOptional })) == xs0.filter({ $0.getOptional != nil }).map({ $0.getOptional! })
+		property("mapFlatten is the same as removing the optionals from an array and forcing") <- forAll { (xs0 : Array<Int?>) in
+			return mapFlatten(xs0) == xs0.filter({ $0 != nil }).map({ $0! })
 		}
 
 		property("indexArray is safe") <- forAll { (l : [Int]) in
@@ -83,18 +83,18 @@ class ArrayExtSpec : XCTestCase {
 			return (lhs == rhs) // broken up as 'too complex' for compiler
 		}
 
-		property("Array obeys the Monad left identity law") <- forAll { (a : Int, fa : ArrowOf<Int, ArrayOf<Int>>) in
-			let f = { $0.getArray } • fa.getArrow
+		property("Array obeys the Monad left identity law") <- forAll { (a : Int, fa : ArrowOf<Int, [Int]>) in
+			let f = fa.getArrow
 			return (Array.pure(a) >>- f) == f(a)
 		}
 
 		property("Array obeys the Monad right identity law") <- forAll { (m : [Int]) in
 			return (m >>- Array.pure) == m
 		}
 
-		property("Array obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, ArrayOf<Int>>, ga : ArrowOf<Int, ArrayOf<Int>>) in
-			let f = { $0.getArray } • fa.getArrow
-			let g = { $0.getArray } • ga.getArrow
+		property("Array obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, [Int]>, ga : ArrowOf<Int, [Int]>) in
+			let f = fa.getArrow
+			let g = ga.getArrow
 			return forAll { (m : [Int]) in
 				return ((m >>- f) >>- g) == (m >>- { x in f(x) >>- g })
 			}
@@ -140,8 +140,7 @@ class ArrayExtSpec : XCTestCase {
 			}
 		}
 
-		property("intercalate behaves") <- forAll { (xs : [Int], xxsa : Array<ArrayOf<Int>>) in
-			let xxs = xxsa.map { $0.getArray }
+		property("intercalate behaves") <- forAll { (xs : [Int], xxs : Array<[Int]>) in
 			return intercalate(xs, nested: xxs) == concat(xxs.intersperse(xs))
 		}
 
diff --git a/Tests/SwiftzTests/ArrowExtSpec.swift b/Tests/SwiftzTests/ArrowExtSpec.swift
@@ -79,9 +79,9 @@ class ArrowExtSpec : XCTestCase {
 			}
 		}
 
-		property("Arrow obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, ArrayOf<Int>>, ga : ArrowOf<Int, ArrayOf<Int>>) in
-			let f = { $0.getArray } • fa.getArrow
-			let g = { $0.getArray } • ga.getArrow
+		property("Arrow obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, [Int]>, ga : ArrowOf<Int, [Int]>) in
+			let f = fa.getArrow
+			let g = ga.getArrow
 			return forAll { (m : [Int]) in
 				return ((m >>- f) >>- g) == (m >>- { x in f(x) >>- g })
 			}
diff --git a/Tests/SwiftzTests/IdentitySpec.swift b/Tests/SwiftzTests/IdentitySpec.swift
@@ -15,22 +15,12 @@ import SwiftCheck
 	import Swiftx
 #endif
 
-extension Identity where T : Arbitrary {
+extension Identity : Arbitrary where T : Arbitrary {
 	public static var arbitrary : Gen<Identity<A>> {
 		return A.arbitrary.map(Identity.pure)
 	}
 }
 
-extension Identity : WitnessedArbitrary {
-	public typealias Param = T
-
-	public static func forAllWitnessed<A : Arbitrary>(_ wit : @escaping (A) -> T, pf : @escaping (Identity<T>) -> Testable) -> Property {
-		return forAllShrink(Identity<A>.arbitrary, shrinker: const([]), f: { bl in
-			return pf(bl.fmap(wit))
-		})
-	}
-}
-
 class IdentitySpec : XCTestCase {
 	func testProperties() {
 		property("Identity obeys the Functor identity law") <- forAll { (x : Identity<Int>) in
diff --git a/Tests/SwiftzTests/ListSpec.swift b/Tests/SwiftzTests/ListSpec.swift
@@ -16,7 +16,7 @@ import SwiftCheck
 #endif
 
 /// Generates an array of arbitrary values.
-extension List where Element : Arbitrary {
+extension List : Arbitrary where Element : Arbitrary {
 	public static var arbitrary : Gen<List<Element>> {
 		return [Element].arbitrary.map(List.init)
 	}
@@ -26,16 +26,6 @@ extension List where Element : Arbitrary {
 	}
 }
 
-extension List : WitnessedArbitrary {
-	public typealias Param = Element
-
-	public static func forAllWitnessed<A : Arbitrary>(_ wit : @escaping (A) -> Element, pf : @escaping (List<Element>) -> Testable) -> Property {
-		return forAllShrink(List<A>.arbitrary, shrinker: List<A>.shrink, f: { bl in
-			return pf(bl.map(wit))
-		})
-	}
-}
-
 class ListSpec : XCTestCase {
 	func testProperties() {
 		property("Lists of Equatable elements obey reflexivity") <- forAll { (l : List<Int>) in
diff --git a/Tests/SwiftzTests/NonEmptyListSpec.swift b/Tests/SwiftzTests/NonEmptyListSpec.swift
@@ -15,28 +15,18 @@ import SwiftCheck
 	import Swiftx
 #endif
 
-extension NonEmptyList where Element : Arbitrary {
+extension NonEmptyList : Arbitrary where Element : Arbitrary {
 	public static var arbitrary : Gen<NonEmptyList<Element>> {
 		return [Element].arbitrary.suchThat({ !$0.isEmpty }).map { NonEmptyList<Element>(List(fromArray: $0))! }
 	}
 
 	public static func shrink(_ xs : NonEmptyList<Element>) -> [NonEmptyList<Element>] {
-		return List<Element>.shrink(xs.toList()).filter({ !$0.isEmpty }).flatMap { xs in
+		return List<Element>.shrink(xs.toList()).filter({ !$0.isEmpty }).compactMap { xs in
 			return NonEmptyList(xs)!
 		}
 	}
 }
 
-extension NonEmptyList : WitnessedArbitrary {
-	public typealias Param = Element
-
-	public static func forAllWitnessed<A : Arbitrary>(_ wit : @escaping (A) -> Element, pf : @escaping (NonEmptyList<Element>) -> Testable) -> Property {
-		return forAllShrink(NonEmptyList<A>.arbitrary, shrinker: NonEmptyList<A>.shrink, f: { bl in
-			return pf(bl.fmap(wit))
-		})
-	}
-}
-
 class NonEmptyListSpec : XCTestCase {
 	func testProperties() {
 		property("Non-empty Lists of Equatable elements obey reflexivity") <- forAllShrink(NonEmptyList<Int>.arbitrary, shrinker: NonEmptyList<Int>.shrink) { l in
diff --git a/Tests/SwiftzTests/OptionalExtSpec.swift b/Tests/SwiftzTests/OptionalExtSpec.swift
@@ -78,18 +78,18 @@ class OptionalExtSpec : XCTestCase {
 			return l == r
 		}
 
-		property("Optional obeys the Monad left identity law") <- forAll { (a : Int, fa : ArrowOf<Int, OptionalOf<Int>>) in
-			let f = { $0.getOptional } • fa.getArrow
+		property("Optional obeys the Monad left identity law") <- forAll { (a : Int, fa : ArrowOf<Int, Optional<Int>>) in
+			let f = fa.getArrow
 			return (Optional.pure(a) >>- f) == f(a)
 		}
 
 		property("Optional obeys the Monad right identity law") <- forAll { (m : Optional<Int>) in
 			return (m >>- Optional.pure) == m
 		}
 
-		property("Optional obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, OptionalOf<Int>>, ga : ArrowOf<Int, OptionalOf<Int>>) in
-			let f = { $0.getOptional } • fa.getArrow
-			let g = { $0.getOptional } • ga.getArrow
+		property("Optional obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, Optional<Int>>, ga : ArrowOf<Int, Optional<Int>>) in
+			let f = fa.getArrow
+			let g = ga.getArrow
 			return forAll { (m : Optional<Int>) in
 				return ((m >>- f) >>- g) == (m >>- { x in f(x) >>- g })
 			}
diff --git a/Tests/SwiftzTests/ProxySpec.swift b/Tests/SwiftzTests/ProxySpec.swift
@@ -89,10 +89,10 @@ class ProxySpec : XCTestCase {
 			return (m >>- Proxy.pure) == m
 		}
 
-		property("Proxy obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, ArrayOf<Int>>, ga : ArrowOf<Int, ArrayOf<Int>>, m : ArrayOf<Int>) in
-			let f = { $0.getArray } • fa.getArrow
-			let g = { $0.getArray } • ga.getArrow
-			return ((m.getArray >>- f) >>- g) == (m.getArray >>- { x in f(x) >>- g })
+		property("Proxy obeys the Monad associativity law") <- forAll { (fa : ArrowOf<Int, [Int]>, ga : ArrowOf<Int, [Int]>, m : [Int]) in
+			let f = fa.getArrow
+			let g = ga.getArrow
+			return ((m >>- f) >>- g) == (m >>- { x in f(x) >>- g })
 		}
 
 		property("Proxy obeys the Comonad identity law") <- forAll { (x : Proxy<Int>) in
diff --git a/Tests/SwiftzTests/StreamSpec.swift b/Tests/SwiftzTests/StreamSpec.swift
@@ -17,7 +17,7 @@ import SwiftCheck
 
 
 /// Generates a Swiftz.Stream of arbitrary values.
-extension Swiftz.Stream where Element : Arbitrary {
+extension Swiftz.Stream : Arbitrary where Element : Arbitrary {
 	public static var arbitrary : Gen<Swiftz.Stream<Element>> {
 		return Element.arbitrary.flatMap { x in
 			return Element.arbitrary.flatMap { y in
@@ -29,19 +29,6 @@ extension Swiftz.Stream where Element : Arbitrary {
 	}
 }
 
-extension Swiftz.Stream : WitnessedArbitrary {
-	public typealias Param = Element
-	
-	public static func forAllWitnessed<A : Arbitrary>(_ wit : @escaping (A) -> Element, pf : @escaping ((Swiftz.Stream<Element>) -> Testable)) -> Property {
-		return forAllShrink(Swiftz.Stream<A>.arbitrary, shrinker: Swiftz.Stream<A>.shrink, f: { bl in
-			return pf(bl.fmap(wit))
-		})
-	}
-
-	public static func shrink(_ xs : Swiftz.Stream<Element>) -> [Swiftz.Stream<Element>] { return [] }
-}
-
-
 class StreamSpec : XCTestCase {
 	func testProperties() {
 		
diff --git a/Tests/SwiftzTests/WriterSpec.swift b/Tests/SwiftzTests/WriterSpec.swift
@@ -15,7 +15,7 @@ import SwiftCheck
 	import Swiftx
 #endif
 
-extension Writer where T : Arbitrary {
+extension Writer : Arbitrary where T : Arbitrary {
 	public static var arbitrary : Gen<Writer<W, T>> {
 		return Gen<(T, W)>.zip(T.arbitrary, Gen.pure(W.mempty)).map(Writer.init)
 	}
@@ -26,16 +26,6 @@ extension Writer where T : Arbitrary {
 	}
 }
 
-extension Writer : WitnessedArbitrary {
-	public typealias Param = T
-
-	public static func forAllWitnessed<W, A : Arbitrary>(_ wit : @escaping (A) -> T, pf : @escaping (Writer<W, T>) -> Testable) -> Property {
-		return forAllShrink(Writer<W, A>.arbitrary, shrinker: Writer<W, A>.shrink, f: { bl in
-			return pf(bl.fmap(wit))
-		})
-	}
-}
-
 class WriterSpec : XCTestCase {
 	func testWriterProperties() {
 		property("Writers obey reflexivity") <- forAll { (l : Writer<String, Int>) in

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ extension Sequence {`
`446`	`446`	`/// a (Key, Value) pair for the dictionary, if nil is returned then the value is`
`447`	`447`	`/// not added to the dictionary.`
`448`	`448`	`public func mapAssociate<Key, Value>(_ f : (Iterator.Element) -> (Key, Value)?) -> [Key : Value] {`
`449`		`- return Dictionary(flatMap(f))`
	`449`	`+ return Dictionary(compactMap(f))`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`/// Creates a dictionary of Key-Value pairs generated from the transformer function returning the key (the label)`