[WIP] Update CwlPreconditionTesting to 2.0.0-beta.1

Author: ikesyo

Cartfile.private

@@ -1 +1,2 @@
-github "mattgallagher/CwlPreconditionTesting" == 1.2.0
+github "mattgallagher/CwlCatchException" == 2.0.0-beta.1
+github "mattgallagher/CwlPreconditionTesting" == 2.0.0-beta.1

Cartfile.resolved

@@ -1 +1,2 @@
-github "mattgallagher/CwlPreconditionTesting" "1.2.0"
+github "mattgallagher/CwlCatchException" "2.0.0-beta.1"
+github "mattgallagher/CwlPreconditionTesting" "2.0.0-beta.1"

Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/LICENSE.txt renamed to Carthage/Checkouts/CwlCatchException/LICENSE.txt

@@ -1,10 +1,10 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
 	name: "CwlCatchException",
 	products: [
-		.library(name: "CwlCatchException", type: .dynamic, targets: ["CwlCatchException"]),
+		.library(name: "CwlCatchException", targets: ["CwlCatchException"]),
 	],
 	targets: [
 		.target(name: "CwlCatchException", dependencies: [.target(name: "CwlCatchExceptionSupport")]),

Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift renamed to Carthage/Checkouts/CwlCatchException/Package.swift

@@ -0,0 +1,18 @@
+# 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/Tests/CwlCatchExceptionTests/CwlCatchExceptionTests.swift) for syntax.
+
+## Requirements
+
+From version 2.0.0-beta.1, building CwlCatchException requires Swift 5 or newer and the Swift Package Manager.
+
+For use with older versions of Swift or other package managers, [use version 1.2.0 or older](https://github.com/mattgallagher/CwlCatchException/tree/1.2.0).
+
+## Adding to your project
+
+Add the following to the `dependencies` array in your "Package.swift" file:
+
+	 .package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: Version("2.0.0-beta.1"))
+
+Or by adding `https://github.com/mattgallagher/CwlCatchException.git`, version 2.0.0-beta.1 or later, to the list of Swift packages for any project in Xcode.

Carthage/Checkouts/CwlCatchException/README.md

@@ -20,9 +20,6 @@
 
 #import "CwlCatchException.h"
 
-#if !SWIFT_PACKAGE
-__attribute__((visibility("hidden")))
-#endif
 NSException* __nullable catchExceptionOfKind(Class __nonnull type, void (^ __nonnull inBlock)(void)) {
 	@try {
 		inBlock();

Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift renamed to Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift

@@ -20,13 +20,4 @@
 
 #import <Foundation/Foundation.h>
 
-//! Project version number for CwlCatchException.
-FOUNDATION_EXPORT double CwlCatchExceptionVersionNumber;
-
-//! Project version string for CwlCatchException.
-FOUNDATION_EXPORT const unsigned char CwlCatchExceptionVersionString[];
-
-#if !SWIFT_PACKAGE
-__attribute__((visibility("hidden")))
-#endif
 NSException* __nullable catchExceptionOfKind(Class __nonnull type, void (^ __nonnull inBlock)(void));

Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m renamed to Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m

@@ -1,28 +1,27 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
 	name: "CwlPreconditionTesting",
 	products: [
-		.library(name: "CwlPreconditionTesting", type: .dynamic, targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"])
+		.library(name: "CwlPreconditionTesting", targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"]),
+		.library(name: "CwlPosixPreconditionTesting", targets: ["CwlPosixPreconditionTesting"])
 	],
 	dependencies: [
-		.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: "1.2.0")
+		.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: Version(2, 0, 0, prereleaseIdentifiers: ["-beta.1"]))
 	],
 	targets: [
 		.target(
 			name: "CwlPreconditionTesting",
 			dependencies: [
 				.target(name: "CwlMachBadInstructionHandler"),
 				.product(name: "CwlCatchException")
-			],
-			exclude: [
-				"./Mach/CwlPreconditionTesting.h",
-				"./Posix/CwlPreconditionTesting.h",
-				"./CwlCatchBadInstructionPosix.swift"
 			]
 		),
+		.target(
+			name: "CwlPosixPreconditionTesting"
+		),
 		.target(name: "CwlMachBadInstructionHandler"),
-		.testTarget(name: "CwlPreconditionTestingTests", dependencies: ["CwlPreconditionTesting"])
+		.testTarget(name: "CwlPreconditionTestingTests", dependencies: ["CwlPreconditionTesting", "CwlPosixPreconditionTesting"])
 	]
 )