Skip to content

Commit 6ee2d30

Browse files
WidcketWidcket
authored
Drop support for iOS 12, tvOS 12, macOS 10.15, watch0S < 7, and Xcode 13 (#184)
1 parent 051f765 commit 6ee2d30

8 files changed

+43
-39
lines changed

‎Cartfile.private

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Quick" ~> 6.0
1+
github "Quick/Quick" ~> 7.0
22
github "Quick/Nimble" ~> 12.0

‎Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Nimble" "v12.0.0"
2-
github "Quick/Quick" "v6.1.0"
1+
github "Quick/Nimble" "v12.0.1"
2+
github "Quick/Quick" "v7.0.2"

‎Package.swift

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// swift-tools-version:5.5
1+
// swift-tools-version:5.7
22

33
import PackageDescription
44

55
let package = Package(
66
name: "SimpleKeychain",
7-
platforms: [.iOS(.v12), .macOS(.v10_15), .tvOS(.v12), .watchOS("6.2")],
7+
platforms: [.iOS(.v13), .macOS(.v11), .tvOS(.v13), .watchOS(.v7)],
88
products: [.library(name: "SimpleKeychain", targets: ["SimpleKeychain"])],
99
dependencies: [
10-
.package(name: "Quick", url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "6.0.0")),
11-
.package(name: "Nimble", url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "12.0.0"))
10+
.package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "7.0.0")),
11+
.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "12.0.0")),
1212
],
1313
targets: [
1414
.target(
@@ -18,7 +18,11 @@ let package = Package(
1818
exclude: ["Info.plist"]),
1919
.testTarget(
2020
name: "SimpleKeychainTests",
21-
dependencies: ["SimpleKeychain", "Quick", "Nimble"],
21+
dependencies: [
22+
"SimpleKeychain",
23+
.product(name: "Quick", package: "Quick"),
24+
.product(name: "Nimble", package: "Nimble"),
25+
],
2226
path: "SimpleKeychainTests",
2327
exclude: ["Info.plist"])
2428
]

‎SimpleKeychain.podspec

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ Pod::Spec.new do |s|
1212
s.source = { :git => 'https://github.com/auth0/SimpleKeychain.git', :tag => s.version.to_s }
1313
s.social_media_url = 'https://twitter.com/auth0'
1414

15-
s.ios.deployment_target = '12.0'
16-
s.osx.deployment_target = '10.15'
17-
s.tvos.deployment_target = '12.0'
18-
s.watchos.deployment_target = '6.2'
15+
s.ios.deployment_target = '13.0'
16+
s.osx.deployment_target = '11.0'
17+
s.tvos.deployment_target = '13.0'
18+
s.watchos.deployment_target = '7.0'
1919

2020
s.source_files = 'SimpleKeychain/*.swift'
21-
s.swift_versions = ['5.5', '5.6']
21+
s.swift_versions = ['5.7', '5.8']
2222
end

‎SimpleKeychain.xcodeproj/project.pbxproj

+22-22
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@
958958
SWIFT_VERSION = 5.0;
959959
TARGETED_DEVICE_FAMILY = 3;
960960
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestHost.app/tvOSTestHost";
961-
TVOS_DEPLOYMENT_TARGET = 12.0;
961+
TVOS_DEPLOYMENT_TARGET = 13.0;
962962
};
963963
name = Debug;
964964
};
@@ -983,7 +983,7 @@
983983
SWIFT_VERSION = 5.0;
984984
TARGETED_DEVICE_FAMILY = 3;
985985
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestHost.app/tvOSTestHost";
986-
TVOS_DEPLOYMENT_TARGET = 12.0;
986+
TVOS_DEPLOYMENT_TARGET = 13.0;
987987
};
988988
name = Release;
989989
};
@@ -1018,7 +1018,7 @@
10181018
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10191019
SWIFT_VERSION = 5.0;
10201020
TARGETED_DEVICE_FAMILY = 4;
1021-
WATCHOS_DEPLOYMENT_TARGET = 6.2;
1021+
WATCHOS_DEPLOYMENT_TARGET = 7.0;
10221022
};
10231023
name = Debug;
10241024
};
@@ -1047,7 +1047,7 @@
10471047
SKIP_INSTALL = YES;
10481048
SWIFT_VERSION = 5.0;
10491049
TARGETED_DEVICE_FAMILY = 4;
1050-
WATCHOS_DEPLOYMENT_TARGET = 6.2;
1050+
WATCHOS_DEPLOYMENT_TARGET = 7.0;
10511051
};
10521052
name = Release;
10531053
};
@@ -1076,7 +1076,7 @@
10761076
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10771077
SWIFT_VERSION = 5.0;
10781078
TARGETED_DEVICE_FAMILY = 3;
1079-
TVOS_DEPLOYMENT_TARGET = 12.0;
1079+
TVOS_DEPLOYMENT_TARGET = 13.0;
10801080
};
10811081
name = Debug;
10821082
};
@@ -1104,7 +1104,7 @@
11041104
SKIP_INSTALL = YES;
11051105
SWIFT_VERSION = 5.0;
11061106
TARGETED_DEVICE_FAMILY = 3;
1107-
TVOS_DEPLOYMENT_TARGET = 12.0;
1107+
TVOS_DEPLOYMENT_TARGET = 13.0;
11081108
};
11091109
name = Release;
11101110
};
@@ -1136,7 +1136,7 @@
11361136
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
11371137
SWIFT_VERSION = 5.0;
11381138
TARGETED_DEVICE_FAMILY = 3;
1139-
TVOS_DEPLOYMENT_TARGET = 12.0;
1139+
TVOS_DEPLOYMENT_TARGET = 13.0;
11401140
};
11411141
name = Debug;
11421142
};
@@ -1164,7 +1164,7 @@
11641164
SDKROOT = appletvos;
11651165
SWIFT_VERSION = 5.0;
11661166
TARGETED_DEVICE_FAMILY = 3;
1167-
TVOS_DEPLOYMENT_TARGET = 12.0;
1167+
TVOS_DEPLOYMENT_TARGET = 13.0;
11681168
};
11691169
name = Release;
11701170
};
@@ -1175,7 +1175,7 @@
11751175
BUNDLE_LOADER = "$(TEST_HOST)";
11761176
DEBUG_INFORMATION_FORMAT = dwarf;
11771177
INFOPLIST_FILE = SimpleKeychainTests/Info.plist;
1178-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1178+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
11791179
LD_RUNPATH_SEARCH_PATHS = (
11801180
"$(inherited)",
11811181
"@executable_path/Frameworks",
@@ -1195,7 +1195,7 @@
11951195
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11961196
BUNDLE_LOADER = "$(TEST_HOST)";
11971197
INFOPLIST_FILE = SimpleKeychainTests/Info.plist;
1198-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1198+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
11991199
LD_RUNPATH_SEARCH_PATHS = (
12001200
"$(inherited)",
12011201
"@executable_path/Frameworks",
@@ -1220,7 +1220,7 @@
12201220
"@executable_path/../Frameworks",
12211221
"@loader_path/../Frameworks",
12221222
);
1223-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1223+
MACOSX_DEPLOYMENT_TARGET = 11.0;
12241224
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests;
12251225
PRODUCT_NAME = SimpleKeychainTests;
12261226
SDKROOT = macosx;
@@ -1240,7 +1240,7 @@
12401240
"@executable_path/../Frameworks",
12411241
"@loader_path/../Frameworks",
12421242
);
1243-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1243+
MACOSX_DEPLOYMENT_TARGET = 11.0;
12441244
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests;
12451245
PRODUCT_NAME = SimpleKeychainTests;
12461246
SDKROOT = macosx;
@@ -1260,7 +1260,7 @@
12601260
"$(inherited)",
12611261
);
12621262
INFOPLIST_FILE = SimpleKeychainApp/Info.plist;
1263-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1263+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
12641264
LD_RUNPATH_SEARCH_PATHS = (
12651265
"$(inherited)",
12661266
"@executable_path/Frameworks",
@@ -1281,7 +1281,7 @@
12811281
CODE_SIGN_IDENTITY = "iPhone Developer";
12821282
DEVELOPMENT_TEAM = "";
12831283
INFOPLIST_FILE = SimpleKeychainApp/Info.plist;
1284-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1284+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
12851285
LD_RUNPATH_SEARCH_PATHS = (
12861286
"$(inherited)",
12871287
"@executable_path/Frameworks",
@@ -1343,8 +1343,8 @@
13431343
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13441344
GCC_WARN_UNUSED_FUNCTION = YES;
13451345
GCC_WARN_UNUSED_VARIABLE = YES;
1346-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1347-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1346+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
1347+
MACOSX_DEPLOYMENT_TARGET = 11.0;
13481348
MTL_ENABLE_DEBUG_INFO = YES;
13491349
ONLY_ACTIVE_ARCH = YES;
13501350
SDKROOT = iphoneos;
@@ -1398,8 +1398,8 @@
13981398
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13991399
GCC_WARN_UNUSED_FUNCTION = YES;
14001400
GCC_WARN_UNUSED_VARIABLE = YES;
1401-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1402-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1401+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
1402+
MACOSX_DEPLOYMENT_TARGET = 11.0;
14031403
MTL_ENABLE_DEBUG_INFO = NO;
14041404
SDKROOT = iphoneos;
14051405
SWIFT_COMPILATION_MODE = wholemodule;
@@ -1423,7 +1423,7 @@
14231423
DYLIB_INSTALL_NAME_BASE = "@rpath";
14241424
INFOPLIST_FILE = SimpleKeychain/Info.plist;
14251425
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1426-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1426+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
14271427
LD_RUNPATH_SEARCH_PATHS = (
14281428
"$(inherited)",
14291429
"@executable_path/Frameworks",
@@ -1448,7 +1448,7 @@
14481448
DYLIB_INSTALL_NAME_BASE = "@rpath";
14491449
INFOPLIST_FILE = SimpleKeychain/Info.plist;
14501450
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1451-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1451+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
14521452
LD_RUNPATH_SEARCH_PATHS = (
14531453
"$(inherited)",
14541454
"@executable_path/Frameworks",
@@ -1485,7 +1485,7 @@
14851485
"@executable_path/../Frameworks",
14861486
"@loader_path/Frameworks",
14871487
);
1488-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1488+
MACOSX_DEPLOYMENT_TARGET = 11.0;
14891489
PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)";
14901490
PRODUCT_NAME = SimpleKeychain;
14911491
SDKROOT = macosx;
@@ -1514,7 +1514,7 @@
15141514
"@executable_path/../Frameworks",
15151515
"@loader_path/Frameworks",
15161516
);
1517-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1517+
MACOSX_DEPLOYMENT_TARGET = 11.0;
15181518
PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)";
15191519
PRODUCT_NAME = SimpleKeychain;
15201520
SDKROOT = macosx;

‎SimpleKeychainTests/AccessibilitySpec.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Quick
44
import SimpleKeychain
55

66
class AccessibilitySpec: QuickSpec {
7-
override func spec() {
7+
override class func spec() {
88
describe("raw representable") {
99
context("from raw value to case") {
1010
it("should map kSecAttrAccessibleWhenUnlocked") {

‎SimpleKeychainTests/SimpleKeychainErrorSpec.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Quick
66
@testable import SimpleKeychain
77

88
class SimpleKeychainErrorSpec: QuickSpec {
9-
override func spec() {
9+
override class func spec() {
1010
describe("init") {
1111
it("should initialize with code") {
1212
let sut = SimpleKeychainError(code: .operationNotImplemented)

‎SimpleKeychainTests/SimpleKeychainSpec.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ let PublicKeyTag = "public"
88
let PrivateKeyTag = "private"
99
let KeychainService = "com.auth0.simplekeychain.tests"
1010

11-
class SimpleKeychainSpec: QuickSpec {
12-
override func spec() {
11+
class SimpleKeychainSpec: AsyncSpec {
12+
override class func spec() {
1313
describe("SimpleKeychain") {
1414
var sut: SimpleKeychain!
1515

0 commit comments

Comments
 (0)