From 2f39dec0f869ea3f83aaa37a0a02a86c9eb22542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandar=20Vacic=CC=81?= Date: Fri, 9 Oct 2020 13:25:30 +0200 Subject: [PATCH 1/3] Updated for Xcode 12. Moved deployment targets up. --- JWT.xcodeproj/project.pbxproj | 20 +++++++++------- .../xcshareddata/xcschemes/JWT-OSX.xcscheme | 24 ++++++++----------- .../xcshareddata/xcschemes/JWT-iOS.xcscheme | 6 +---- .../xcshareddata/xcschemes/JWT-tvOS.xcscheme | 6 +---- .../xcschemes/JWT-watchOS.xcscheme | 6 +---- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/JWT.xcodeproj/project.pbxproj b/JWT.xcodeproj/project.pbxproj index 1963dc9..8340ede 100644 --- a/JWT.xcodeproj/project.pbxproj +++ b/JWT.xcodeproj/project.pbxproj @@ -398,7 +398,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = Cocode; TargetAttributes = { 279D639B1AD07FFF0024E2BC = { @@ -656,6 +656,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -680,7 +681,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -716,6 +718,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -734,7 +737,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; @@ -824,7 +828,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = JWT/Info.plist; INSTALL_PATH = "@rpath"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)"; SDKROOT = iphoneos; @@ -844,7 +847,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = JWT/Info.plist; INSTALL_PATH = "@rpath"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)"; SDKROOT = iphoneos; @@ -870,7 +872,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -889,7 +891,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -909,7 +911,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -929,7 +931,7 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; VALIDATE_PRODUCT = YES; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; diff --git a/JWT.xcodeproj/xcshareddata/xcschemes/JWT-OSX.xcscheme b/JWT.xcodeproj/xcshareddata/xcschemes/JWT-OSX.xcscheme index d2c24e8..9813803 100644 --- a/JWT.xcodeproj/xcshareddata/xcschemes/JWT-OSX.xcscheme +++ b/JWT.xcodeproj/xcshareddata/xcschemes/JWT-OSX.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -53,17 +62,6 @@ - - - - - - - - - - - - - - - - - - - - Date: Thu, 4 Feb 2021 14:20:24 +0100 Subject: [PATCH 2/3] Updated SPM support to modern times. --- Package.swift | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Package.swift b/Package.swift index 240d007..3a82e55 100644 --- a/Package.swift +++ b/Package.swift @@ -1,24 +1,27 @@ +// swift-tools-version:5.1 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), - ], - exclude: [ - "Sources/JWT/HMACCryptoSwift.swift", - ] -) -#else let package = Package( - name: "JWT", - dependencies: [ - .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 8), - ], - exclude: [ - "Sources/JWT/HMACCommonCrypto.swift", - ] + name: "JWT", + platforms: [ + .iOS(.v12), + .tvOS(.v12), + .watchOS(.v6) + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "JWT", + targets: ["JWT"]) + ], + dependencies: [], + targets: [ + .target( + name: "JWT", + dependencies: [], + path: "Sources/JWT", + exclude: ["HMACCryptoSwift.swift"] + ) + ], + swiftLanguageVersions: [.v5] ) -#endif From 404321e0fbde51b2eb69898907c0f6a964672a10 Mon Sep 17 00:00:00 2001 From: Emilio Del Castillo Date: Mon, 14 Nov 2022 17:42:17 +0100 Subject: [PATCH 3/3] Fix swift-tools specification The new line is necessary, otherwise SPM doesn't seem to be able to read it correctly --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index 3a82e55..6573673 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,5 @@ // swift-tools-version:5.1 + import PackageDescription let package = Package(