Support Swift 4.1 on Xcode 9.3

Author: Kuniwak

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v7.0.2"
-github "Quick/Quick" "v1.2.0"
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"

Carthage/Checkouts/Nimble/.gitignore

@@ -11,7 +11,15 @@ Nimble.framework.zip
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
-
+Carthage/Checkouts/**/*.*
+Carthage/Checkouts/**/Cart*
+Carthage/Checkouts/**/Tests
+!Carthage/Checkouts/**/LICENSE.*
+!Carthage/Checkouts/**/*.md
+!Carthage/Checkouts/**/*.swift
+!Carthage/Checkouts/**/*.h
+!Carthage/Checkouts/**/*.m
+!Carthage/Checkouts/**/*.c
 Carthage/Build
 
 # Swift Package Manager

Carthage/Checkouts/Nimble/.swiftlint.yml

@@ -9,7 +9,7 @@ included:
   - Tests
 
 excluded:
-  - Sources/Lib
+  - Carthage/Checkouts
 
 trailing_comma:
   mandatory_comma: true

Carthage/Checkouts/Nimble/.travis.yml

@@ -14,6 +14,18 @@ matrix:
     - os: osx
       env: TYPE=macos
       osx_image: xcode9
+    - os: osx
+      env: TYPE=macos
+      osx_image: xcode9.1
+    - os: osx
+      env: TYPE=macos
+      osx_image: xcode9.2
+    - os: osx
+      env: TYPE=macos
+      osx_image: xcode9.3
+    - os: osx
+      env: TYPE=macos
+      osx_image: xcode9.4
     - os: osx
       env: TYPE=swiftpm
     - os: osx
@@ -25,6 +37,14 @@ matrix:
       env: TYPE=swiftpm
       install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+    - os: linux
+      dist: trusty
+      sudo: required
+      env:
+        - TYPE=swiftpm
+        - SWIFT_VERSION=4.0.2
+      install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 install:
   - if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi
 script:

Carthage/Checkouts/Nimble/Cartfile.private

@@ -0,0 +1 @@
+github "mattgallagher/CwlPreconditionTesting" "1e62a726d54c743f4585233f08fcaac7307319b5"

Carthage/Checkouts/Nimble/Cartfile.resolved

@@ -0,0 +1,2 @@
+github "mattgallagher/CwlCatchException" "b14c111e9b33cd142bd4bc75c482cfd5c3490923"
+github "mattgallagher/CwlPreconditionTesting" "1e62a726d54c743f4585233f08fcaac7307319b5"

Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlCatchException/LICENSE.txt

@@ -0,0 +1,13 @@
+Copyright © 2017 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlCatchException/Package.swift

@@ -0,0 +1,9 @@
+import PackageDescription
+
+let package = Package(
+	name: "CwlCatchException",
+	targets: [
+		Target(name: "CwlCatchException", dependencies: ["CwlCatchExceptionSupport"]),
+		Target(name: "CwlCatchExceptionSupport")
+	]
+)

Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlCatchException/README.md

@@ -0,0 +1,46 @@
+# CwlCatchException
+A simple Swift wrapper around an Objective-C `@try`/`@catch` statement that selectively catches Objective-C exceptions by `NSException` subtype, rethrowing if any caught exception is not the expected subtype.
+
+Look at [CwlCatchExceptionTests.swift](https://github.com/mattgallagher/CwlCatchException/blob/master/CwlCatchExceptionTests/CwlCatchExceptionTests.swift?ts=4) for syntax.
+
+## Adding to your project
+
+This project can be used by direct inclusion in your projects or through any of the Swift Package Manager, CocoaPods or Carthage.
+
+Minimum requirements are iOS 8 or macOS 10.9.
+
+### Manual inclusion
+
+1. In a subdirectory of your project's directory, run `git clone https://github.com/mattgallagher/CwlCatchException.git`
+2. Drag the "CwlCatchException.xcodeproj" file from the Finder into your own project's file tree in Xcode
+3. Add the "CwlCatchException.framework" from the "Products" folder of the CwlCatchException project's file tree to the "Copy Files (Frameworks)" build phases of any target that you want to include this module.
+
+That third step is a little tricky if you're unfamiliar with Xcode but it involves:
+
+a. click on your project in the file tree
+b. click on the target to whih you want to add this module
+c. select the "Build Phases" tab
+d. if you don't already have a "Copy File" build phase with a "Destination: Frameworks", add one using the "+" button in the top left of the tab
+e. click the "+" within the "Copy File (Frameworks)" phase and from the list that appears, select the "CwlCatchException.framework" (if there are multiple frameworks with the same name, look for the one that appears *above* the corresponding macOS or iOS CwlCatchException testing target).
+
+### Swift Package Manager
+
+Add the following to the `dependencies` array in your "Package.swift" file:
+
+    .Package(url: "https://github.com/mattgallagher/CwlCatchException.git", majorVersion: 1),
+
+Or, if you're using the `swift-tools-version:4.0` package manager, add the following to the `dependencies` array in your "Package.swift" file:
+
+    .package(url: "https://github.com/mattgallagher/CwlCatchException.git", majorVersion: 1)
+
+### CocoaPods
+
+Add the following to your target in your "Podfile":
+
+    pod 'CwlCatchException', :git => 'https://github.com/mattgallagher/CwlCatchException.git'
+
+### Carthage
+
+Add the following line to your Cartfile:
+
+    git "https://github.com/mattgallagher/CwlCatchException.git" "master"

Carthage/Checkouts/Quick/Externals/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift renamed to Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift

@@ -24,14 +24,12 @@ import Foundation
 import CwlCatchExceptionSupport
 #endif
 
-private func catchReturnTypeConverter<T: NSException>(_ instance: T, block: () -> Void) -> T? {
-	// Get the type from an *instance*, instead of a receiving the type directly
-	return catchExceptionOfKind(T.self, block) as? T
+private func catchReturnTypeConverter<T: NSException>(_ type: T.Type, block: () -> Void) -> T? {
+	return catchExceptionOfKind(type, block) as? T
 }
 
 extension NSException {
 	public static func catchException(in block: () -> Void) -> Self? {
-		// Use a dummy instance of Self to provide the type
-		return catchReturnTypeConverter(self.init(), block: block)
+		return catchReturnTypeConverter(self, block: block)
 	}
 }