Try an update to Xcode 9.3

CodaFi · CodaFi · commit b6b4bc61dc0a · 2018-04-11T22:55:42.000-04:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+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
         - pushd Utilities
@@ -16,7 +16,7 @@ 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
         - pushd Utilities
@@ -25,29 +25,20 @@ matrix:
       script:
         - set -o pipefail
         - xcodebuild test -scheme SwiftCheck | xcpretty -c
-        # -- Start iOS --
-        # !!!: 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 build-for-testing -scheme SwiftCheck-iOS -destination "platform=iOS Simulator,name=${iOS_DEVICE_NAME},OS=${iOS_RUNTIME_VERSION}" | xcpretty -c
-        - xcodebuild test -scheme SwiftCheck-iOS -destination "platform=iOS Simulator,name=${iOS_DEVICE_NAME},OS=${iOS_RUNTIME_VERSION}" | xcpretty -c
-        - xcodebuild build-for-testing -scheme SwiftCheck-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
-        - xcodebuild test -scheme SwiftCheck-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
+        - xcodebuild build-for-testing -scheme SwiftCheck-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c
+        - xcodebuild test -scheme SwiftCheck-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c
+        - xcodebuild build-for-testing -scheme SwiftCheck-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c
+        - xcodebuild test -scheme SwiftCheck-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/development/ubuntu1404/swift-DEVELOPMENT-SNAPSHOT-2017-11-16-a/swift-DEVELOPMENT-SNAPSHOT-2017-11-16-a-ubuntu14.04.tar.gz
-        - tar xzf swift-DEVELOPMENT-SNAPSHOT-2017-11-16-a-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-DEVELOPMENT-SNAPSHOT-2017-11-16-a-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}"
         - pushd Utilities
         - ./compile.sh
         - popd
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.1
 
 import PackageDescription
 
diff --git a/Sources/SwiftCheck/Modifiers.swift b/Sources/SwiftCheck/Modifiers.swift
@@ -496,10 +496,8 @@ private final class PointerOfImpl<T : Arbitrary> : Arbitrary {
 	}
 
 	deinit {
-		if self.size > 0 && self.ptr != nil {
-			self.ptr?.deallocate(capacity: self.size)
-			self.ptr = nil
-		}
+		self.ptr?.deallocate()
+		self.ptr = nil
 	}
 
 	static var arbitrary : Gen<PointerOfImpl<T>> {
diff --git a/SwiftCheck.xcodeproj/project.pbxproj b/SwiftCheck.xcodeproj/project.pbxproj
@@ -532,7 +532,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Typelift;
 				TargetAttributes = {
 					8240CCB01C3A123600EF4D29 = {
@@ -941,12 +941,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;
@@ -995,12 +997,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/SwiftCheck.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftCheck.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/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 = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
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 = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
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 = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Tests/SwiftCheckTests/FormatterSpec.swift b/Tests/SwiftCheckTests/FormatterSpec.swift
@@ -27,7 +27,7 @@ struct Formatter<Value> {
 
 	func format(_ value : Value) -> String {
 		let formatted = makeString(value)
-		let maxIndex = formatted.index(formatted.startIndex, offsetBy: String.IndexDistance(lengthLimit))
+		let maxIndex = formatted.index(formatted.startIndex, offsetBy: Int(lengthLimit))
 		if maxIndex >= formatted.endIndex {
 			return formatted
 		} else {
@@ -76,7 +76,7 @@ class FormatterSpec : XCTestCase {
 				let formatter = af.get
 				let string = formatter.format(x)
 				_ = formatter.unFormat(string)
-				return string.distance(from: string.startIndex, to: string.endIndex) <= String.IndexDistance(formatter.lengthLimit)
+				return string.distance(from: string.startIndex, to: string.endIndex) <= Int(formatter.lengthLimit)
 			}
 
 		})
diff --git a/Tests/SwiftCheckTests/LambdaSpec.swift b/Tests/SwiftCheckTests/LambdaSpec.swift
@@ -82,7 +82,7 @@ extension Exp : Arbitrary {
 			return [a] + Exp.shrink(a).map { .lam(x, $0) }
 		case let .app(a, b):
 			let part1 : [Exp] = [a, b]
-				+ [a].flatMap({ (expr : Exp) -> Exp? in
+				+ [a].compactMap({ (expr : Exp) -> Exp? in
 					if case let .lam(x, a) = expr {
 						return a.subst(x, b)
 					}
diff --git a/Tests/SwiftCheckTests/PropertySpec.swift b/Tests/SwiftCheckTests/PropertySpec.swift
@@ -62,7 +62,7 @@ class PropertySpec : XCTestCase {
 			// CHECK-NEXT: .
 			property("Again undoes once") <- forAll { (n : Int) in
 				var counter : Int = 0
-				quickCheck(forAll { (_ : Int) in
+				quickCheck(asserting: "", property: forAll { (_ : Int) in
 					counter += 1
 					return true
 				}.once.again)
diff --git a/Tutorial.playground/Contents.swift b/Tutorial.playground/Contents.swift
@@ -336,11 +336,11 @@ property("The reverse of the reverse of an array is that array") <- forAll { (xs
 
 //: Because `forAll` is variadic it works for a large number and variety of types too:
 
-//                                           +--- This Modifier Type produces Arrays of Integers.
-//                                           |                    +--- This Modifier Type generates functions.  That's right, SwiftCheck
-//                                           |                    |    can generate *functions*!!
-//                                           v                    v
-property("filter behaves") <- forAll { (xs : ArrayOf<Int>, pred : ArrowOf<Int, Bool>) in
+//                                           +--- Produce arrays of integers.
+//                                           |             +--- This Modifier Type generates functions.  That's right, SwiftCheck
+//                                           |             |    can generate *functions*!!
+//                                           v             v
+property("filter behaves") <- forAll { (xs : [Int], pred : ArrowOf<Int, Bool>) in
 	let f = pred.getArrow
 	return xs.getArray.filter(f).reduce(true, { $0 && f($1) })
 	// ^ This property says that if we filter an array then apply the predicate
diff --git a/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Tutorial.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>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:4.0`
	`1`	`+// swift-tools-version:4.1`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -496,10 +496,8 @@ private final class PointerOfImpl<T : Arbitrary> : Arbitrary {`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`deinit {`
`499`		`- if self.size > 0 && self.ptr != nil {`
`500`		`- self.ptr?.deallocate(capacity: self.size)`
`501`		`- self.ptr = nil`
`502`		`- }`
	`499`	`+ self.ptr?.deallocate()`
	`500`	`+ self.ptr = nil`
`503`	`501`	`}`
`504`	`502`
`505`	`503`	`static var arbitrary : Gen<PointerOfImpl<T>> {`