diff --git a/Package.swift b/Package.swift index 86fab7e..bbd0daf 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.4 /** * Copyright IBM Corporation and the Kitura project authors 2018-2020 @@ -23,6 +23,12 @@ let targetDependencies: [Target.Dependency] let package = Package( name: "SwiftJWT", + platforms: [ + .macOS(.v11), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v7) + ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( @@ -31,20 +37,21 @@ let package = Package( ) ], dependencies: [ - .package(name: "CryptorRSA", url: "https://github.com/Kitura/BlueRSA.git", from: "1.0.202"), - .package(name: "Cryptor", url: "https://github.com/Kitura/BlueCryptor.git", from: "2.0.1"), + .package(name: "CryptorRSA", url: "https://github.com/Kitura/BlueRSA.git", from: "1.0.203"), + .package(name: "Cryptor", url: "https://github.com/Kitura/BlueCryptor.git", from: "2.1.0"), .package(name: "CryptorECC", url: "https://github.com/Kitura/BlueECC.git", from: "1.2.200"), .package(url: "https://github.com/Kitura/LoggerAPI.git", from: "2.0.0"), .package(url: "https://github.com/Kitura/KituraContracts.git", from: "2.0.1") ], targets: [ - .target(name: "SwiftJWT", dependencies: [ - "LoggerAPI", - "KituraContracts", - "CryptorRSA", - "Cryptor", - "CryptorECC", - ]), + .target(name: "SwiftJWT", + dependencies: [ + "LoggerAPI", + "KituraContracts", + "CryptorRSA", + "Cryptor", + "CryptorECC", + ]), .testTarget(name: "SwiftJWTTests", dependencies: ["SwiftJWT"]) ] ) diff --git a/SwiftJWT.podspec b/SwiftJWT.podspec index 6e54bf3..5db5b17 100644 --- a/SwiftJWT.podspec +++ b/SwiftJWT.podspec @@ -1,20 +1,20 @@ Pod::Spec.new do |s| s.name = "SwiftJWT" - s.version = "4.0.1" + s.version = "4.1.0" s.summary = "An implementation of JSON Web Token using Swift." s.homepage = "https://github.com/Kitura/Swift-JWT" s.license = { :type => "Apache License, Version 2.0" } s.authors = 'IBM and the Kitura project authors' s.module_name = 'SwiftJWT' - s.swift_version = '5.2' - s.osx.deployment_target = "10.13" - s.ios.deployment_target = "11.0" - s.tvos.deployment_target = "11.0" - s.watchos.deployment_target = "4.0" + s.swift_version = '5.4' + s.osx.deployment_target = "11.5" + s.ios.deployment_target = "14.5" + s.tvos.deployment_target = "14.5" + s.watchos.deployment_target = "7.5" s.source = { :git => "https://github.com/Kitura/Swift-JWT.git", :tag => s.version } s.source_files = "Sources/**/*.swift" - s.dependency 'BlueRSA', '~> 1.0.200' - s.dependency 'BlueCryptor', '~> 2.0.1' + s.dependency 'BlueRSA', '~> 1.0.203' + s.dependency 'BlueCryptor', '~> 2.1.0' s.dependency 'BlueECC', '~> 1.2.200' s.dependency 'LoggerAPI', '~> 2.0.0' s.dependency 'KituraContracts', '~> 2.0.1' diff --git a/Tests/SwiftJWTTests/TestJWT.swift b/Tests/SwiftJWTTests/TestJWT.swift index 647727a..469fbfb 100644 --- a/Tests/SwiftJWTTests/TestJWT.swift +++ b/Tests/SwiftJWTTests/TestJWT.swift @@ -72,8 +72,13 @@ struct TestClaims: Claims, Equatable { } } -extension Header: Equatable { +#if compiler(>=6) +extension Header: @retroactive Equatable {} +#else +extension Header: Equatable {} +#endif +extension Header { /// Function to check if two headers are equal. Required to conform to the equatable protocol. public static func == (lhs: Header, rhs: Header) -> Bool { return lhs.alg == rhs.alg &&