Merge pull request #682 from Quick/tweak-cwlpreconditiontesting

Tweak CwlPreconditionTesting and CwlCatchException
Quick · Sep 9, 2019 · ece5f01 · ece5f01
2 parents f3c7caf + 368fbb6
commit ece5f01
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift b/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift
@@ -4,7 +4,7 @@ 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")]),

diff --git a/...sting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m b/...sting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m
@@ -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();

diff --git a/...pendencies/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h b/...pendencies/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h
@@ -26,7 +26,4 @@ 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));
diff --git a/Carthage/Checkouts/CwlPreconditionTesting/Package.swift b/Carthage/Checkouts/CwlPreconditionTesting/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 let package = Package(
 	name: "CwlPreconditionTesting",
 	products: [
-		.library(name: "CwlPreconditionTesting", type: .dynamic, targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"])
+		.library(name: "CwlPreconditionTesting", targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"])
 	],
 	dependencies: [
 		.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: "1.2.0")