Merge pull request #286 from rabbitinspace/master

CodaFi · web-flow · commit 077c096c3ddf · 2019-03-28T01:12:20.000-04:00
Fix building with Xcode 10.2 and migrate to Swift 5
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode10
+      osx_image: xcode10.2
       before_install:
         - git submodule update --init --recursive
         - pushd Utilities
@@ -17,7 +17,7 @@ matrix:
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode10
+      osx_image: xcode10.2
       before_install:
         - git submodule update --init --recursive
         - pushd Utilities
@@ -37,9 +37,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.2-release/ubuntu1404/swift-4.2-RELEASE/swift-4.2-RELEASE-ubuntu14.04.tar.gz
-        - tar xzf swift-4.2-RELEASE-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-4.2-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}"
         - pushd Utilities
         - ./compile.sh
         - popd
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "trill-lang/FileCheck" "0.0.8"
+github "trill-lang/FileCheck" "0.1.0"
diff --git a/Carthage/Checkouts/FileCheck b/Carthage/Checkouts/FileCheck
@@ -1 +1 @@
-Subproject commit 89b8480055f9adf8ce2f9ad5e2fac7ac1076242e
+Subproject commit bd9cb30ceee1f21c02f51a7168f58471449807d8
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 
@@ -10,7 +10,7 @@ let package = Package(
 			targets: ["SwiftCheck"]),
 	],
 	dependencies: [
-		.package(url: "https://github.com/llvm-swift/FileCheck.git", from: "0.0.3")
+		.package(url: "https://github.com/llvm-swift/FileCheck.git", from: "0.1.0")
 	],
 	targets: [
 		.target(
diff --git a/Sources/SwiftCheck/Modifiers.swift b/Sources/SwiftCheck/Modifiers.swift
@@ -462,7 +462,7 @@ fileprivate final class IsoOfImpl<T : Hashable & CoArbitrary & Arbitrary, U : Eq
 	static func shrink(_ f : IsoOfImpl<T, U>) -> [IsoOfImpl<T, U>] {
 		return f.table.flatMap { (t) -> [IsoOfImpl<T, U>] in
 			let (x, y) = t
-			return Zip2Sequence(_sequence1: T.shrink(x), _sequence2: U.shrink(y)).map({ t in
+			return zip(T.shrink(x), U.shrink(y)).map({ t in
 				let (y1 , y2) = t
 				return IsoOfImpl<T, U>(
 					{ (z : T) -> U in
diff --git a/Sources/SwiftCheck/Test.swift b/Sources/SwiftCheck/Test.swift
@@ -1006,7 +1006,7 @@ private func printDistributionGraph(_ st : CheckerState) {
 	}
 
 	let gAllLabels : [String] = st.collected.map({ (s : Set<String>) in
-		return s.filter({ t in st.labels[t] == .some(0) }).reduce("", { (l : String, r : String) in l + ", " + r })
+		return s.filter({ t in st.labels[t] == .some(0) }).sorted().reduce("", { (l : String, r : String) in l + ", " + r })
 	})
 	let gAll : [[String]] = gAllLabels.filter({ !$0.isEmpty }).sorted().groupBy(==)
 	let gPrint : [String] = gAll.map({ ss in showP((ss.count * 100) / st.successfulTestCount) + ss.first! })
diff --git a/Sources/SwiftCheck/WitnessedArbitrary.swift b/Sources/SwiftCheck/WitnessedArbitrary.swift
@@ -135,13 +135,6 @@ extension Range : Arbitrary where Bound : Arbitrary {
 	}
 }
 
-extension LazyCollection : Arbitrary where Base : Arbitrary {
-	/// Returns a generator of `LazyCollection`s of arbitrary `Base`s.
-	public static var arbitrary : Gen<LazyCollection<Base>> {
-		return Base.arbitrary.map({ $0.lazy })
-	}
-}
-
 extension LazySequence : Arbitrary where Base : Arbitrary {
 	/// Returns a generator of `LazySequence`s of arbitrary `Base`s.
 	public static var arbitrary : Gen<LazySequence<Base>> {
diff --git a/SwiftCheck.xcodeproj/project.pbxproj b/SwiftCheck.xcodeproj/project.pbxproj
@@ -532,7 +532,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Typelift;
 				TargetAttributes = {
 					8240CCB01C3A123600EF4D29 = {
@@ -554,17 +554,17 @@
 					};
 					84DF75F71B0BD54600C912B0 = {
 						CreatedOnToolsVersion = 6.4;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 					84DF76011B0BD54600C912B0 = {
 						CreatedOnToolsVersion = 6.4;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = 844FCC87198B320500EB242A /* Build configuration list for PBXProject "SwiftCheck" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -847,7 +847,6 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -880,7 +879,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -903,7 +901,6 @@
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -923,7 +920,6 @@
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -933,6 +929,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -980,6 +977,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -989,6 +987,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1028,6 +1027,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1062,7 +1062,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1095,7 +1094,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1120,7 +1118,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1142,7 +1139,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1177,8 +1173,6 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1211,8 +1205,6 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -1242,8 +1234,6 @@
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1265,8 +1255,6 @@
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-iOS.xcscheme b/SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-tvOS.xcscheme b/SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck.xcscheme b/SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Tests/SwiftCheckTests/ComplexSpec.swift b/Tests/SwiftCheckTests/ComplexSpec.swift
@@ -29,15 +29,15 @@ class ComplexSpec : XCTestCase {
 				lower,
 				numeric,
 				special,
-				]).proliferateNonEmpty.suchThat({ $0[($0.endIndex - 1)] != "." }).map(String.init(stringInterpolationSegment:))
+				]).proliferateNonEmpty.suchThat({ $0[($0.endIndex - 1)] != "." }).map { String($0) }
 
 			let hostname = Gen<Character>.one(of: [
 				lower,
 				numeric,
 				Gen.pure("-"),
-				]).proliferateNonEmpty.map(String.init(stringInterpolationSegment:))
+				]).proliferateNonEmpty.map { String($0) }
 
-			let tld = lower.proliferateNonEmpty.suchThat({ $0.count > 1 }).map(String.init(stringInterpolationSegment:))
+			let tld = lower.proliferateNonEmpty.suchThat({ $0.count > 1 }).map { String($0) }
 
 			let emailGen = glue([localEmail, Gen.pure("@"), hostname, Gen.pure("."), tld])
 
diff --git a/Tests/SwiftCheckTests/LambdaSpec.swift b/Tests/SwiftCheckTests/LambdaSpec.swift
@@ -24,8 +24,8 @@ struct Name : Arbitrary, Equatable, Hashable, CustomStringConvertible {
 		return self.unName
 	}
 
-	var hashValue : Int {
-		return self.unName.hashValue
+	func hash(into hasher: inout Hasher) {
+		hasher.combine(unName)
 	}
 
 	static func == (l : Name, r : Name) -> Bool {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "trill-lang/FileCheck" "0.0.8"`
	`1`	`+github "trill-lang/FileCheck" "0.1.0"`
Original file line number	Diff line number	Diff line change
`@@ -1006,7 +1006,7 @@ private func printDistributionGraph(_ st : CheckerState) {`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`	`1008`	`let gAllLabels : [String] = st.collected.map({ (s : Set<String>) in`
`1009`		`- return s.filter({ t in st.labels[t] == .some(0) }).reduce("", { (l : String, r : String) in l + ", " + r })`
	`1009`	`+ return s.filter({ t in st.labels[t] == .some(0) }).sorted().reduce("", { (l : String, r : String) in l + ", " + r })`
`1010`	`1010`	`})`
`1011`	`1011`	`let gAll : [[String]] = gAllLabels.filter({ !$0.isEmpty }).sorted().groupBy(==)`
`1012`	`1012`	`let gPrint : [String] = gAll.map({ ss in showP((ss.count * 100) / st.successfulTestCount) + ss.first! })`
Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,6 @@ extension Range : Arbitrary where Bound : Arbitrary {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`		`-extension LazyCollection : Arbitrary where Base : Arbitrary {`
`139`		- /// Returns a generator of `LazyCollection`s of arbitrary `Base`s.
`140`		`- public static var arbitrary : Gen<LazyCollection<Base>> {`
`141`		`- return Base.arbitrary.map({ $0.lazy })`
`142`		`- }`
`143`		`-}`
`144`		`-`
`145`	`138`	`extension LazySequence : Arbitrary where Base : Arbitrary {`
`146`	`139`	/// Returns a generator of `LazySequence`s of arbitrary `Base`s.
`147`	`140`	`public static var arbitrary : Gen<LazySequence<Base>> {`