diff --git a/Cartfile.private b/Cartfile.private index 002be42..2715491 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,2 +1,2 @@ -github "Quick/Quick" ~> 6.0 +github "Quick/Quick" ~> 7.0 github "Quick/Nimble" ~> 12.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 8d79393..87c0c61 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Quick/Nimble" "v12.0.0" -github "Quick/Quick" "v6.1.0" +github "Quick/Nimble" "v12.0.1" +github "Quick/Quick" "v7.0.2" diff --git a/Package.swift b/Package.swift index 2873cec..d383dc0 100644 --- a/Package.swift +++ b/Package.swift @@ -1,14 +1,14 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.7 import PackageDescription let package = Package( name: "SimpleKeychain", - platforms: [.iOS(.v12), .macOS(.v10_15), .tvOS(.v12), .watchOS("6.2")], + platforms: [.iOS(.v13), .macOS(.v11), .tvOS(.v13), .watchOS(.v7)], products: [.library(name: "SimpleKeychain", targets: ["SimpleKeychain"])], dependencies: [ - .package(name: "Quick", url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "6.0.0")), - .package(name: "Nimble", url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "12.0.0")) + .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "7.0.0")), + .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "12.0.0")), ], targets: [ .target( @@ -18,7 +18,11 @@ let package = Package( exclude: ["Info.plist"]), .testTarget( name: "SimpleKeychainTests", - dependencies: ["SimpleKeychain", "Quick", "Nimble"], + dependencies: [ + "SimpleKeychain", + .product(name: "Quick", package: "Quick"), + .product(name: "Nimble", package: "Nimble"), + ], path: "SimpleKeychainTests", exclude: ["Info.plist"]) ] diff --git a/SimpleKeychain.podspec b/SimpleKeychain.podspec index 7a305ae..d7c37e1 100644 --- a/SimpleKeychain.podspec +++ b/SimpleKeychain.podspec @@ -12,11 +12,11 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/auth0/SimpleKeychain.git', :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/auth0' - s.ios.deployment_target = '12.0' - s.osx.deployment_target = '10.15' - s.tvos.deployment_target = '12.0' - s.watchos.deployment_target = '6.2' + s.ios.deployment_target = '13.0' + s.osx.deployment_target = '11.0' + s.tvos.deployment_target = '13.0' + s.watchos.deployment_target = '7.0' s.source_files = 'SimpleKeychain/*.swift' - s.swift_versions = ['5.5', '5.6'] + s.swift_versions = ['5.7', '5.8'] end diff --git a/SimpleKeychain.xcodeproj/project.pbxproj b/SimpleKeychain.xcodeproj/project.pbxproj index 4db238d..cf2e7f4 100644 --- a/SimpleKeychain.xcodeproj/project.pbxproj +++ b/SimpleKeychain.xcodeproj/project.pbxproj @@ -958,7 +958,7 @@ SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestHost.app/tvOSTestHost"; - TVOS_DEPLOYMENT_TARGET = 12.0; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Debug; }; @@ -983,7 +983,7 @@ SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestHost.app/tvOSTestHost"; - TVOS_DEPLOYMENT_TARGET = 12.0; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Release; }; @@ -1018,7 +1018,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.2; + WATCHOS_DEPLOYMENT_TARGET = 7.0; }; name = Debug; }; @@ -1047,7 +1047,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.2; + WATCHOS_DEPLOYMENT_TARGET = 7.0; }; name = Release; }; @@ -1076,7 +1076,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 12.0; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Debug; }; @@ -1104,7 +1104,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 12.0; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Release; }; @@ -1136,7 +1136,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 12.0; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Debug; }; @@ -1164,7 +1164,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 12.0; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Release; }; @@ -1175,7 +1175,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; DEBUG_INFORMATION_FORMAT = dwarf; INFOPLIST_FILE = SimpleKeychainTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1195,7 +1195,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; INFOPLIST_FILE = SimpleKeychainTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1220,7 +1220,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests; PRODUCT_NAME = SimpleKeychainTests; SDKROOT = macosx; @@ -1240,7 +1240,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests; PRODUCT_NAME = SimpleKeychainTests; SDKROOT = macosx; @@ -1260,7 +1260,7 @@ "$(inherited)", ); INFOPLIST_FILE = SimpleKeychainApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1281,7 +1281,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SimpleKeychainApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1343,8 +1343,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MACOSX_DEPLOYMENT_TARGET = 10.15; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1398,8 +1398,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MACOSX_DEPLOYMENT_TARGET = 10.15; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -1423,7 +1423,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = SimpleKeychain/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1448,7 +1448,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = SimpleKeychain/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1485,7 +1485,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SimpleKeychain; SDKROOT = macosx; @@ -1514,7 +1514,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SimpleKeychain; SDKROOT = macosx; diff --git a/SimpleKeychainTests/AccessibilitySpec.swift b/SimpleKeychainTests/AccessibilitySpec.swift index beead30..8faea48 100644 --- a/SimpleKeychainTests/AccessibilitySpec.swift +++ b/SimpleKeychainTests/AccessibilitySpec.swift @@ -4,7 +4,7 @@ import Quick import SimpleKeychain class AccessibilitySpec: QuickSpec { - override func spec() { + override class func spec() { describe("raw representable") { context("from raw value to case") { it("should map kSecAttrAccessibleWhenUnlocked") { diff --git a/SimpleKeychainTests/SimpleKeychainErrorSpec.swift b/SimpleKeychainTests/SimpleKeychainErrorSpec.swift index a3f0de0..69fe044 100644 --- a/SimpleKeychainTests/SimpleKeychainErrorSpec.swift +++ b/SimpleKeychainTests/SimpleKeychainErrorSpec.swift @@ -6,7 +6,7 @@ import Quick @testable import SimpleKeychain class SimpleKeychainErrorSpec: QuickSpec { - override func spec() { + override class func spec() { describe("init") { it("should initialize with code") { let sut = SimpleKeychainError(code: .operationNotImplemented) diff --git a/SimpleKeychainTests/SimpleKeychainSpec.swift b/SimpleKeychainTests/SimpleKeychainSpec.swift index 832172c..9a90a66 100644 --- a/SimpleKeychainTests/SimpleKeychainSpec.swift +++ b/SimpleKeychainTests/SimpleKeychainSpec.swift @@ -8,8 +8,8 @@ let PublicKeyTag = "public" let PrivateKeyTag = "private" let KeychainService = "com.auth0.simplekeychain.tests" -class SimpleKeychainSpec: QuickSpec { - override func spec() { +class SimpleKeychainSpec: AsyncSpec { + override class func spec() { describe("SimpleKeychain") { var sut: SimpleKeychain!