From 368fbb68bb0e39c676d149f83a1e790f89156504 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Mon, 9 Sep 2019 18:18:18 +0900 Subject: [PATCH] Tweak CwlPreconditionTesting and CwlCatchException --- .../Dependencies/CwlCatchException/Package.swift | 2 +- .../Sources/CwlCatchExceptionSupport/CwlCatchException.m | 3 --- .../CwlCatchExceptionSupport/include/CwlCatchException.h | 3 --- Carthage/Checkouts/CwlPreconditionTesting/Package.swift | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift b/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift index 6489eb513..33689a22c 100644 --- 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/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m b/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m index 251c29cb8..ff35465d8 100644 --- a/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m +++ b/Carthage/Checkouts/CwlPreconditionTesting/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/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h b/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h index 428d6f2a1..47b06bf2b 100644 --- a/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h +++ b/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/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 index 975331326..12b0c068d 100644 --- 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")