Skip to content

Commit 95d71e9

Browse files
committed
refactor: use Swift Package Manager 5
1 parent 9f67977 commit 95d71e9

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

CommonCrypto/module.modulemap

Lines changed: 0 additions & 4 deletions
This file was deleted.

CommonCrypto/shim.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

Package.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.1
22

33
import PackageDescription
44

55

66
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
7-
let dependencies = [
8-
Package.Dependency.package(url: "https://github.com/kylef-archive/CommonCrypto.git", from: "1.0.0"),
9-
]
7+
let dependencies: [Package.Dependency] = []
108
let excludes = ["HMAC/HMACCryptoSwift.swift"]
119
let targetDependencies: [Target.Dependency] = []
1210
#else
@@ -25,7 +23,11 @@ let package = Package(
2523
],
2624
dependencies: dependencies,
2725
targets: [
28-
.target(name: "JWA", dependencies: targetDependencies, exclude: excludes),
26+
.target(name: "JWA",
27+
exclude: excludes,
28+
linkerSettings: [
29+
.linkedFramework("CommonCrypto", .when(platforms: [.iOS, .macOS, .watchOS, .tvOS])),
30+
]),
2931
.target(name: "JWT", dependencies: ["JWA"]),
3032
.testTarget(name: "JWATests", dependencies: ["JWA"]),
3133
.testTarget(name: "JWTTests", dependencies: ["JWT"]),

Sources/JWA/HMAC/HMACCommonCrypto.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import CommonCrypto
55
extension HMACAlgorithm: SignAlgorithm, VerifyAlgorithm {
66
public func sign(_ message: Data) -> Data {
77
let context = UnsafeMutablePointer<CCHmacContext>.allocate(capacity: 1)
8-
defer { context.deallocate(capacity: 1) }
8+
defer { context.deallocate() }
99

1010
key.withUnsafeBytes() { (buffer: UnsafePointer<UInt8>) in
1111
CCHmacInit(context, hash.commonCryptoAlgorithm, buffer, size_t(key.count))

0 commit comments

Comments
 (0)