Skip to content

Commit 941d11c

Browse files
jdmoreirajdmoreira
committed
Merge branch 'joao/tied-it-together-swift6'
2 parents 2fb8ac0 + 10c8675 commit 941d11c

File tree

14 files changed

+148
-59
lines changed

14 files changed

+148
-59
lines changed

‎.github/workflows/build_and_test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
jobs:
99
build:
1010
name: Build and Test (macOS & iOS)
11-
runs-on: macos-latest
11+
runs-on: macos-15
1212
steps:
13-
- name: Select latest stable Xcode
14-
uses: maxim-lobanov/setup-xcode@v1
15-
with:
16-
xcode-version: 'latest-stable'
17-
13+
- name: Select Xcode 16.4
14+
run: |
15+
sudo xcode-select -s /Applications/Xcode_16.4.app
16+
xcodebuild -version
17+
1818
- name: Check lint rules
1919
id: lint
2020
shell: bash

‎.github/workflows/docc_deploy.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ env:
1616

1717
jobs:
1818
deploy-docs:
19-
runs-on: macos-latest
19+
runs-on: macos-15
2020

2121
steps:
2222
- uses: actions/checkout@v4
2323

24-
- uses: maxim-lobanov/setup-xcode@v1
25-
with:
26-
xcode-version: latest-stable
24+
- name: Select Xcode 16.4
25+
run: |
26+
sudo xcode-select -s /Applications/Xcode_16.4.app
27+
xcodebuild -version
2728
2829
- name: Build Docs
2930
uses: fwcd/swift-docc-action@v1

‎.github/workflows/docc_preview.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ env:
1919
jobs:
2020
pr-preview:
2121
name: PR DocC Preview
22-
runs-on: macos-latest
22+
runs-on: macos-15
2323

2424
steps:
2525
- uses: actions/checkout@v4
2626

27-
- uses: maxim-lobanov/setup-xcode@v1
28-
with:
29-
xcode-version: latest-stable
27+
- name: Select Xcode 16.4
28+
run: |
29+
sudo xcode-select -s /Applications/Xcode_16.4.app
30+
xcodebuild -version
3031
3132
# build only when the PR isn’t being closed
3233
- name: Build Docs

‎FullStackTests/FullStackTests.xcodeproj/project.pbxproj

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
attributes = {
209209
BuildIndependentTargetsInParallel = 1;
210210
LastSwiftUpdateCheck = 1310;
211-
LastUpgradeCheck = 1310;
211+
LastUpgradeCheck = 1630;
212212
TargetAttributes = {
213213
51BBE408273D1AA100DA47CC = {
214214
CreatedOnToolsVersion = 13.1;
@@ -335,8 +335,10 @@
335335
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
336336
COPY_PHASE_STRIP = NO;
337337
DEBUG_INFORMATION_FORMAT = dwarf;
338+
DEVELOPMENT_TEAM = LQA3CS5MM7;
338339
ENABLE_STRICT_OBJC_MSGSEND = YES;
339340
ENABLE_TESTABILITY = YES;
341+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
340342
GCC_C_LANGUAGE_STANDARD = gnu11;
341343
GCC_DYNAMIC_NO_PIC = NO;
342344
GCC_NO_COMMON_BLOCKS = YES;
@@ -351,7 +353,7 @@
351353
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
352354
GCC_WARN_UNUSED_FUNCTION = YES;
353355
GCC_WARN_UNUSED_VARIABLE = YES;
354-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
356+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
355357
MACOSX_DEPLOYMENT_TARGET = 14.0;
356358
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
357359
MTL_FAST_MATH = YES;
@@ -397,8 +399,10 @@
397399
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
398400
COPY_PHASE_STRIP = NO;
399401
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
402+
DEVELOPMENT_TEAM = LQA3CS5MM7;
400403
ENABLE_NS_ASSERTIONS = NO;
401404
ENABLE_STRICT_OBJC_MSGSEND = YES;
405+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
402406
GCC_C_LANGUAGE_STANDARD = gnu11;
403407
GCC_NO_COMMON_BLOCKS = YES;
404408
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -407,7 +411,7 @@
407411
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
408412
GCC_WARN_UNUSED_FUNCTION = YES;
409413
GCC_WARN_UNUSED_VARIABLE = YES;
410-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
414+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
411415
MACOSX_DEPLOYMENT_TARGET = 14.0;
412416
MTL_ENABLE_DEBUG_INFO = NO;
413417
MTL_FAST_MATH = YES;
@@ -427,7 +431,6 @@
427431
CODE_SIGN_STYLE = Automatic;
428432
CURRENT_PROJECT_VERSION = 1;
429433
DEVELOPMENT_ASSET_PATHS = "\"TestHostApp/Preview Content\"";
430-
DEVELOPMENT_TEAM = LQA3CS5MM7;
431434
ENABLE_PREVIEWS = YES;
432435
GENERATE_INFOPLIST_FILE = YES;
433436
INFOPLIST_FILE = "FullStackTests-Info.plist";
@@ -437,7 +440,7 @@
437440
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
438441
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
439442
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
440-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
443+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
441444
LD_RUNPATH_SEARCH_PATHS = (
442445
"$(inherited)",
443446
"@executable_path/Frameworks",
@@ -464,7 +467,6 @@
464467
CODE_SIGN_STYLE = Automatic;
465468
CURRENT_PROJECT_VERSION = 1;
466469
DEVELOPMENT_ASSET_PATHS = "\"TestHostApp/Preview Content\"";
467-
DEVELOPMENT_TEAM = LQA3CS5MM7;
468470
ENABLE_PREVIEWS = YES;
469471
GENERATE_INFOPLIST_FILE = YES;
470472
INFOPLIST_FILE = "FullStackTests-Info.plist";
@@ -474,7 +476,7 @@
474476
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
475477
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
476478
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
477-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
479+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
478480
LD_RUNPATH_SEARCH_PATHS = (
479481
"$(inherited)",
480482
"@executable_path/Frameworks",
@@ -495,13 +497,11 @@
495497
51BBE431273D1AA400DA47CC /* Debug */ = {
496498
isa = XCBuildConfiguration;
497499
buildSettings = {
498-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
499500
BUNDLE_LOADER = "$(TEST_HOST)";
500501
CODE_SIGN_STYLE = Automatic;
501502
CURRENT_PROJECT_VERSION = 1;
502-
DEVELOPMENT_TEAM = LQA3CS5MM7;
503503
GENERATE_INFOPLIST_FILE = YES;
504-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
504+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
505505
LD_RUNPATH_SEARCH_PATHS = (
506506
"$(inherited)",
507507
"@executable_path/Frameworks",
@@ -523,13 +523,11 @@
523523
51BBE432273D1AA400DA47CC /* Release */ = {
524524
isa = XCBuildConfiguration;
525525
buildSettings = {
526-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
527526
BUNDLE_LOADER = "$(TEST_HOST)";
528527
CODE_SIGN_STYLE = Automatic;
529528
CURRENT_PROJECT_VERSION = 1;
530-
DEVELOPMENT_TEAM = LQA3CS5MM7;
531529
GENERATE_INFOPLIST_FILE = YES;
532-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
530+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
533531
LD_RUNPATH_SEARCH_PATHS = (
534532
"$(inherited)",
535533
"@executable_path/Frameworks",

‎FullStackTests/FullStackTests.xcodeproj/xcshareddata/xcschemes/FullStackTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1310"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.10
1+
// swift-tools-version: 6.1
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription

‎Samples/OATHSample/OATHSample.xcodeproj/project.pbxproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
attributes = {
132132
BuildIndependentTargetsInParallel = 1;
133133
LastSwiftUpdateCheck = 1310;
134-
LastUpgradeCheck = 1310;
134+
LastUpgradeCheck = 1630;
135135
TargetAttributes = {
136136
51A1AC09273D537500F999A4 = {
137137
CreatedOnToolsVersion = 13.1;
@@ -222,8 +222,10 @@
222222
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
223223
COPY_PHASE_STRIP = NO;
224224
DEBUG_INFORMATION_FORMAT = dwarf;
225+
DEVELOPMENT_TEAM = LQA3CS5MM7;
225226
ENABLE_STRICT_OBJC_MSGSEND = YES;
226227
ENABLE_TESTABILITY = YES;
228+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
227229
GCC_C_LANGUAGE_STANDARD = gnu11;
228230
GCC_DYNAMIC_NO_PIC = NO;
229231
GCC_NO_COMMON_BLOCKS = YES;
@@ -238,7 +240,7 @@
238240
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
239241
GCC_WARN_UNUSED_FUNCTION = YES;
240242
GCC_WARN_UNUSED_VARIABLE = YES;
241-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
243+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
242244
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
243245
MTL_FAST_MATH = YES;
244246
ONLY_ACTIVE_ARCH = YES;
@@ -283,8 +285,10 @@
283285
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
284286
COPY_PHASE_STRIP = NO;
285287
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
288+
DEVELOPMENT_TEAM = LQA3CS5MM7;
286289
ENABLE_NS_ASSERTIONS = NO;
287290
ENABLE_STRICT_OBJC_MSGSEND = YES;
291+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
288292
GCC_C_LANGUAGE_STANDARD = gnu11;
289293
GCC_NO_COMMON_BLOCKS = YES;
290294
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -293,7 +297,7 @@
293297
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
294298
GCC_WARN_UNUSED_FUNCTION = YES;
295299
GCC_WARN_UNUSED_VARIABLE = YES;
296-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
300+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
297301
MTL_ENABLE_DEBUG_INFO = NO;
298302
MTL_FAST_MATH = YES;
299303
SDKROOT = iphoneos;
@@ -312,7 +316,6 @@
312316
CODE_SIGN_STYLE = Automatic;
313317
CURRENT_PROJECT_VERSION = 1;
314318
DEVELOPMENT_ASSET_PATHS = "\"OATHSample/Preview Content\"";
315-
DEVELOPMENT_TEAM = LQA3CS5MM7;
316319
ENABLE_PREVIEWS = YES;
317320
GENERATE_INFOPLIST_FILE = YES;
318321
INFOPLIST_FILE = OATHSample/Info.plist;
@@ -322,7 +325,7 @@
322325
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
323326
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
324327
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
325-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
328+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
326329
LD_RUNPATH_SEARCH_PATHS = (
327330
"$(inherited)",
328331
"@executable_path/Frameworks",
@@ -349,7 +352,6 @@
349352
CODE_SIGN_STYLE = Automatic;
350353
CURRENT_PROJECT_VERSION = 1;
351354
DEVELOPMENT_ASSET_PATHS = "\"OATHSample/Preview Content\"";
352-
DEVELOPMENT_TEAM = LQA3CS5MM7;
353355
ENABLE_PREVIEWS = YES;
354356
GENERATE_INFOPLIST_FILE = YES;
355357
INFOPLIST_FILE = OATHSample/Info.plist;
@@ -359,7 +361,7 @@
359361
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
360362
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
361363
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
362-
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
364+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
363365
LD_RUNPATH_SEARCH_PATHS = (
364366
"$(inherited)",
365367
"@executable_path/Frameworks",
@@ -403,7 +405,7 @@
403405
/* Begin XCLocalSwiftPackageReference section */
404406
6C8465312DADB13300788FB7 /* XCLocalSwiftPackageReference "../../" */ = {
405407
isa = XCLocalSwiftPackageReference;
406-
relativePath = "../../";
408+
relativePath = ../../;
407409
};
408410
/* End XCLocalSwiftPackageReference section */
409411

‎Samples/OATHSample/OATHSample.xcodeproj/xcshareddata/xcschemes/OATHSample.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎YubiKit/UnitTests/PIVPaddingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ struct PIVPaddingTests {
174174
@Test func unpadMalformedData() throws {
175175
let data = Data(
176176
hexEncodedString:
177-
"00bcbb35b6ef5c94a85fb3439a6dabda617a08963cf81023bac19c619b024cb71b8aee25cc30991279c908198ba623fba88547741dbf17a6f2a737ec95542b56b2b429bea8bd3145af7c8f144dcf804b89d3f9de21d6d6dc852fc91c666b8582bf348e1388ac2f54651ae6a1f5355c8d96daf96c922a9f1a499d890412d09454"
177+
"79ce573cfc2bdfe835175ffd4bd01ab35eccfd31e2b009a1943123e9cb2db4878608c821fb96a6c63382aaf1c12ce0f03b83"
178178
)!
179179
do {
180180
let _ = try PIVPadding.unpadRSAData(data, algorithm: .rsaEncryptionPKCS1)

‎YubiKit/YubiKit/SmartCardConnection.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extension SmartCardConnection: Connection {
5959
public func close(error: Error?) async {
6060

6161
try? await didClose.fulfill(error)
62-
// trace(message: "disconnect called on sessionManager")
62+
trace(message: "disconnect called on sessionManager")
6363
}
6464

6565
// @TraceScope
@@ -71,11 +71,11 @@ extension SmartCardConnection: Connection {
7171
public func send(data: Data) async throws -> Data {
7272

7373
guard try await isConnected else {
74-
// trace(message: "no connection – throwing .noConnection")
74+
trace(message: "no connection – throwing .noConnection")
7575
throw ConnectionError.noConnection
7676
}
7777
let response = try await SmartCardConnectionsManager.shared.transmit(request: data, for: self)
78-
// trace(message: "transmit returned \(response.count) bytes")
78+
trace(message: "transmit returned \(response.count) bytes")
7979
return response
8080
}
8181
}
@@ -127,7 +127,7 @@ private final actor SmartCardConnectionsManager {
127127
get throws {
128128
guard let manager = TKSmartCardSlotManager.default else {
129129
assertionFailure("🪪 No default TKSmartCardSlotManager, check entitlements for com.apple.smartcard.")
130-
// trace(message: "no slotsManager – throwing .unsupported")
130+
trace(message: "no slotsManager – throwing .unsupported")
131131
throw SmartCardConnectionError.unsupported
132132
}
133133

@@ -185,21 +185,21 @@ private final actor SmartCardConnectionsManager {
185185
let tkSlot = try await slotManager.getSlot(withName: slot.name)
186186

187187
guard let tkSlot else {
188-
// trace(message: "slot came back as nil")
188+
trace(message: "slot came back as nil")
189189
throw SmartCardConnectionError.getSmartCardSlotFailed
190190
}
191191

192192
guard let card = tkSlot.makeSmartCard() else {
193-
// trace(message: "slot.makeSmartCard() returned nil")
193+
trace(message: "slot.makeSmartCard() returned nil")
194194
throw SmartCardConnectionError.beginSessionFailed
195195
}
196196

197-
// trace(message: "will call card.beginSession()")
197+
trace(message: "will call card.beginSession()")
198198
guard try await card.beginSession() == true else {
199-
// trace(message: "card.beginSession() failed")
199+
trace(message: "card.beginSession() failed")
200200
throw SmartCardConnectionError.beginSessionFailed
201201
}
202-
// trace(message: "card.beginSession() succeded")
202+
trace(message: "card.beginSession() succeded")
203203

204204
// create a new state and return a new connection
205205
connections[slot] = ConnectionState(card: card)

0 commit comments

Comments
 (0)