From 5d918559c37237078f9ca239ad95738d57c0ff9e Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Sat, 30 Sep 2017 17:24:54 +0200 Subject: [PATCH 1/8] Update Package.swift --- Package.swift | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Package.swift b/Package.swift index eb6f28b..58e4417 100644 --- a/Package.swift +++ b/Package.swift @@ -1,24 +1,11 @@ import PackageDescription - -#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) let package = Package( name: "JWT", dependencies: [ - .Package(url: "https://github.com/kylef-archive/CommonCrypto.git", majorVersion: 1), + .Package(url: "git@github.com:IBM-Swift/CommonCrypto.git", majorVersion: 1), ], exclude: [ "Sources/HMACCryptoSwift.swift", ] ) -#else -let package = Package( - name: "JWT", - dependencies: [ - .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 6), - ], - exclude: [ - "Sources/HMACCommonCrypto.swift", - ] -) -#endif From 60f410757e3e56c521185a8e597339832be336ee Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Sat, 30 Sep 2017 17:30:59 +0200 Subject: [PATCH 2/8] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 58e4417..e0287ad 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( name: "JWT", dependencies: [ - .Package(url: "git@github.com:IBM-Swift/CommonCrypto.git", majorVersion: 1), + .Package(url: "git@github.com:IBM-Swift/CommonCrypto.git", majorVersion: 0), ], exclude: [ "Sources/HMACCryptoSwift.swift", From fdf44bbf13c506ba1b6b79adb548cd57115bf491 Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Sat, 30 Sep 2017 17:40:07 +0200 Subject: [PATCH 3/8] Delete module.modulemap --- CommonCrypto/module.modulemap | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 CommonCrypto/module.modulemap diff --git a/CommonCrypto/module.modulemap b/CommonCrypto/module.modulemap deleted file mode 100644 index b70f7d6..0000000 --- a/CommonCrypto/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module CommonCrypto [system] { - header "shim.h" - export * -} From f0a8864ba3960554d381ba8ae56db6e80d73f16d Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Sat, 30 Sep 2017 17:40:27 +0200 Subject: [PATCH 4/8] Delete shim.h --- CommonCrypto/shim.h | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CommonCrypto/shim.h diff --git a/CommonCrypto/shim.h b/CommonCrypto/shim.h deleted file mode 100644 index c332624..0000000 --- a/CommonCrypto/shim.h +++ /dev/null @@ -1 +0,0 @@ -#include From 937b5c6c63517c87d4bfe042167f656186eb547d Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Sat, 30 Sep 2017 17:49:49 +0200 Subject: [PATCH 5/8] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e0287ad..0f60d0f 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( name: "JWT", dependencies: [ - .Package(url: "git@github.com:IBM-Swift/CommonCrypto.git", majorVersion: 0), + .Package(url: "https://github.com/IBM-Swift/CommonCrypto", majorVersion: 0), ], exclude: [ "Sources/HMACCryptoSwift.swift", From 1bcd156f7081318f48ffdbbc8e0c81714968f742 Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Sat, 30 Sep 2017 18:01:14 +0200 Subject: [PATCH 6/8] Update Package.swift --- Package.swift | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0f60d0f..d84bf9d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,11 +1,23 @@ import PackageDescription +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) let package = Package( name: "JWT", dependencies: [ - .Package(url: "https://github.com/IBM-Swift/CommonCrypto", majorVersion: 0), + .Package(url: "https://github.com/IBM-Swift/CommonCrypto.git", majorVersion: 0, minor: 1), ], exclude: [ "Sources/HMACCryptoSwift.swift", ] ) +#else +let package = Package( + name: "JWT", + dependencies: [ + .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 6), + ], + exclude: [ + "Sources/HMACCommonCrypto.swift", + ] +) +#endif From 5b222ba0e4bc2e4aec00e5866cc7734217400192 Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Tue, 10 Oct 2017 18:23:03 +0200 Subject: [PATCH 7/8] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index d84bf9d..ff3f757 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,7 @@ let package = Package( let package = Package( name: "JWT", dependencies: [ - .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 6), + .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 7), ], exclude: [ "Sources/HMACCommonCrypto.swift", From 5ea27649853e9d962625d122e05797f7eba6af16 Mon Sep 17 00:00:00 2001 From: Marcel Dittmann Date: Fri, 9 Aug 2019 10:58:37 +0200 Subject: [PATCH 8/8] Update Package.swift --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index ff3f757..3dcb2df 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "JWT", dependencies: [ - .Package(url: "https://github.com/IBM-Swift/CommonCrypto.git", majorVersion: 0, minor: 1), + .Package(url: "https://github.com/IBM-Swift/CommonCrypto.git", majorVersion: 1, minor: 0), ], exclude: [ "Sources/HMACCryptoSwift.swift", @@ -14,7 +14,7 @@ let package = Package( let package = Package( name: "JWT", dependencies: [ - .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 7), + .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 1, minor: 0), ], exclude: [ "Sources/HMACCommonCrypto.swift",