Change build pipeline to use Xcode 16 (#37)

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.0)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -27,20 +27,20 @@ GEM
       asciidoctor (~> 2.0)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.963.0)
-    aws-sdk-core (3.201.4)
+    aws-partitions (1.988.0)
+    aws-sdk-core (3.209.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.157.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.167.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -99,8 +99,8 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.111.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -126,10 +126,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.222.0)
+    fastlane (2.224.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -211,12 +211,12 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jazzy (0.15.1)
+    jazzy (0.15.2)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4 (~> 1.3)
@@ -228,14 +228,14 @@ GEM
       xcinvoke (~> 0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.2)
+    jwt (2.9.3)
       base64
     liferaft (0.0.6)
-    logger (1.6.0)
+    logger (1.6.1)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.25.0)
+    minitest (5.25.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -257,8 +257,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.5)
-      strscan
+    rexml (3.3.8)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -277,7 +276,6 @@ GEM
       naturally
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -291,20 +289,20 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
     xcode-install (2.6.8)
       claide (>= 0.9.1, < 1.1.0)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.25.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)

IntegrationTests/HealthCardControl/AuthenticateChallengeE256Test.swift

@@ -45,8 +45,7 @@ final class AuthenticateChallengeE256Test: CardSimulationTerminalTestCase {
 
     func testSignChallenge() async throws {
         let challenge = "1234567890".data(using: .utf8)!
-        _ = try await Self.healthCard
-            .verify(pin: "123456", type: .mrpinHome)
+        _ = try await Self.healthCard.verifyAsync(pin: "123456", type: .mrpinHome)
         let authenticatedResult = try await Self.healthCard.authenticateAsync(challenge: challenge)
 
         expect(authenticatedResult.certificate.signatureAlgorithm) == .ecdsaSha256

IntegrationTests/HealthCardControl/AuthenticateChallengeR2048Test.swift

@@ -39,8 +39,7 @@ final class AuthenticateChallengeR2048Test: CardSimulationTerminalTestCase {
 
     func testSignChallenge() async throws {
         let challenge = "1234567890".data(using: .utf8)!
-        _ = try await Self.healthCard
-            .verify(pin: "123456", type: .mrpinHome)
+        _ = try await Self.healthCard.verifyAsync(pin: "123456", type: .mrpinHome)
         let authenticatedResult = try await Self.healthCard.authenticateAsync(challenge: challenge)
 
         expect(authenticatedResult.certificate.signatureAlgorithm) == .sha256RsaMgf1

IntegrationTests/HealthCardControl/HealthCardTypeExtESIGNIntegrationTest.swift

@@ -48,7 +48,7 @@ final class HealthCardTypeExtESIGNIntegrationTest: CardSimulationTerminalTestCas
         // tag::signChallenge[]
         let challenge = Data([0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8])
         let format2Pin = try Format2Pin(pincode: "123456")
-        _ = try await Self.healthCard.verify(pin: format2Pin, type: EgkFileSystem.Pin.mrpinHome)
+        _ = try await Self.healthCard.verifyAsync(pin: format2Pin, type: EgkFileSystem.Pin.mrpinHome)
         let signResponse = try await Self.healthCard.signAsync(data: challenge)
         expect(signResponse.responseStatus) == ResponseStatus.success
         // end::signChallenge[]

Mintfile

@@ -1,4 +1,4 @@
 realm/SwiftLint@0.44.0
 yonaskolb/xcodegen@2.38.0
-Carthage/Carthage@0.39.0
+Carthage/Carthage@0.40.0
 nicklockwood/SwiftFormat@0.48.7

Tests/NFCDemoTests/ReadingResultsViewSnapshotTests.swift

@@ -21,14 +21,16 @@ import SwiftUI
 import XCTest
 
 // swiftlint:disable force_unwrapping
-class ReadingResultsViewSnapshotTests: XCTestCase {
+class ReadingResultsViewSnapshotTests: ERPSnapshotTestCase {
     func testReadingResultsViewSnapshotTests() throws {
         let sut = NavigationView {
             ReadingResultsView(
                 readingResults: [
-                    ReadingResult(timestamp: "2021-05-26T10:59:37+00:00".date!,
-                                  result: ViewState.value(true),
-                                  commands: []),
+                    ReadingResult(
+                        timestamp: "2021-05-26T10:59:37+00:00".date!,
+                        result: ViewState.value(true),
+                        commands: []
+                    ),
                     ReadingResult(
                         timestamp: "2021-05-26T10:59:38+00:00".date!,
                         result: ViewState.value(true),

Tests/NFCDemoTests/RegisterCANViewSnapshotTests.swift

@@ -19,7 +19,7 @@ import SnapshotTesting
 import SwiftUI
 import XCTest
 
-class RegisterCANViewSnapshotTests: XCTestCase {
+class RegisterCANViewSnapshotTests: ERPSnapshotTestCase {
     func testRegisterCANViewSnapshotTests() throws {
         let sut = RegisterCANView()
             .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)

Tests/NFCDemoTests/RegisterPINViewSnapshotTests.swift

@@ -19,7 +19,7 @@ import SnapshotTesting
 import SwiftUI
 import XCTest
 
-class RegisterPINViewSnapshotTests: XCTestCase {
+class RegisterPINViewSnapshotTests: ERPSnapshotTestCase {
     func testRegisterPINViewSnapshotTests() throws {
         let sut = NavigationView { RegisterPINView(can: "123456") }
             .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)

Tests/NFCDemoTests/StartNFCViewSnapshotTests.swift

@@ -19,7 +19,7 @@ import SnapshotTesting
 import SwiftUI
 import XCTest
 
-class StartNFCViewSnapshotTests: XCTestCase {
+class StartNFCViewSnapshotTests: ERPSnapshotTestCase {
     func testStartNFCViewSnapshotTests() throws {
         let sut = NavigationView {
             StartNFCView(can: "123456", puk: "12345678", oldPin: "123456", pin: "654321", useCase: .login)

Tests/NFCDemoTests/XCTestCase+SnapshotHelper.swift

@@ -41,3 +41,11 @@ extension XCTestCase {
         ]
     }
 }
+
+class ERPSnapshotTestCase: XCTestCase {
+    override func invokeTest() {
+        withSnapshotTesting(record: .failed, diffTool: "open") {
+            super.invokeTest()
+        }
+    }
+}

fastlane/Fastfile

@@ -1,11 +1,24 @@
 #
-# ${GEMATIK_COPYRIGHT_STATEMENT}
-#
+# Copyright (c) 2024 gematik GmbH
+# 
+# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by
+# the European Commission - subsequent versions of the EUPL (the Licence);
+# You may not use this work except in compliance with the Licence.
+# You may obtain a copy of the Licence at:
+# 
+#     https://joinup.ec.europa.eu/software/page/eupl
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the Licence is distributed on an "AS IS" basis,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the Licence for the specific language governing permissions and
+# limitations under the Licence.
+# 
 
 fastlane_version "2.210.1"
 
 xcodes(
-  version: ENV["FL_XCODE_VERSION"] || "15.2.0",
+  version: ENV["FL_XCODE_VERSION"] || "16.0.0",
   select_for_current_build_only: true, 
   update_list: false
 )
@@ -46,7 +59,7 @@ lane :build_mac do
     scan(
       scheme: scheme,
       build_for_testing: true,
-      destination: "platform=macOS,arch=x86_64"
+      destination: "platform=macOS,arch=arm64"
     )
   end
 end
@@ -58,7 +71,7 @@ lane :test_mac do
   mac_schemes.each do |scheme|
     scan(
       scheme: scheme,
-      destination: "platform=macOS,arch=x86_64"
+      destination: "platform=macOS,arch=arm64"
     )
   end
 end

fastlane/Scanfile

@@ -5,7 +5,7 @@
 # fastlane scan --help
 
 # Remove the # in front of the line to enable the option
-device("iPhone 14")
+destination("platform=iOS Simulator,name=iPhone 16,OS=18.0")
 
 project("OpenHealthCardKit.xcodeproj")