Update syntax (#98)

treastrain · Nov 20, 2022 · 82ca04f · 82ca04f
1 parent dd8049a
commit 82ca04f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Sources/Core/NFCReader.swift b/Sources/Core/NFCReader.swift
@@ -12,7 +12,7 @@ public actor NFCReader<TagType: NFCTagType> {
             NotificationCenter.default.post(name: .didChangeNFCReaderSessionAndDelegate, object: sessionAndDelegateChangedObserver, userInfo: [.isNilSessionAndDelegate: sessionAndDelegate == nil])
         }
     }
-    private var sessionAndDelegateChangedObserver: NSObjectProtocol?
+    private var sessionAndDelegateChangedObserver: (any NSObjectProtocol)?
     #endif
 
     public init() {}

diff --git a/Sources/FeliCa/FeliCaTagReader.swift b/Sources/FeliCa/FeliCaTagReader.swift
@@ -8,7 +8,7 @@
 public typealias FeliCaTagReader = NFCReader<NativeTag>
 
 extension FeliCaTagReader {
-    public typealias ReaderSessionProtocol = FeliCaTagReaderSessionProtocol
+    public typealias ReaderSessionProtocol = any FeliCaTagReaderSessionProtocol
 }
 
 extension FeliCaTagReader {
@@ -24,7 +24,7 @@ extension FeliCaTagReader {
             detectingAlertMessage: detectingAlertMessage,
             didBecomeActive: didBecomeActive,
             didInvalidate: didInvalidate,
-            didDetect: { try await didDetect($0 as! FeliCaTagReaderSessionProtocol, $1) }
+            didDetect: { try await didDetect($0 as! any FeliCaTagReaderSessionProtocol, $1) }
         )
     }
     #endif

diff --git a/Sources/FeliCa/FeliCaTagReaderSessionProtocol.swift b/Sources/FeliCa/FeliCaTagReaderSessionProtocol.swift
@@ -9,7 +9,7 @@ public protocol FeliCaTagReaderSessionProtocol: NFCNativeTagReaderSessionProtoco
 
 extension FeliCaTagReaderSessionProtocol {
     #if canImport(CoreNFC)
-    public func connectAsFeliCaTag(to tag: NFCTag) async throws -> NFCFeliCaTag {
+    public func connectAsFeliCaTag(to tag: NFCTag) async throws -> any NFCFeliCaTag {
         guard case .feliCa(let feliCaTag) = tag else {
             throw NFCReaderError(.readerErrorInvalidParameter)
         }

diff --git a/Sources/NDEFMessage/NDEFMessage.swift b/Sources/NDEFMessage/NDEFMessage.swift
@@ -8,7 +8,7 @@
 public enum NDEFMessage: NFCTagType {
     #if canImport(CoreNFC)
     public typealias ReaderSession = NFCNDEFReaderSession
-    public typealias ReaderSessionProtocol = NFCNDEFMessageReaderSessionProtocol
+    public typealias ReaderSessionProtocol = any NFCNDEFMessageReaderSessionProtocol
     public typealias ReaderSessionDetectObject = [NFCNDEFMessage]
     #endif
 }

diff --git a/Sources/NDEFTag/NDEFTag.swift b/Sources/NDEFTag/NDEFTag.swift
@@ -8,7 +8,7 @@
 public enum NDEFTag: NFCTagType {
     #if canImport(CoreNFC)
     public typealias ReaderSession = NFCNDEFReaderSession
-    public typealias ReaderSessionProtocol = NFCNDEFTagReaderSessionProtocol
+    public typealias ReaderSessionProtocol = any NFCNDEFTagReaderSessionProtocol
     public typealias ReaderSessionDetectObject = [NFCNDEFTag]
     #endif
 }

diff --git a/Sources/NativeTag/NativeTag.swift b/Sources/NativeTag/NativeTag.swift
@@ -8,7 +8,7 @@
 public enum NativeTag: NFCTagType {
     #if canImport(CoreNFC)
     public typealias ReaderSession = NFCTagReaderSession
-    public typealias ReaderSessionProtocol = NFCNativeTagReaderSessionProtocol
+    public typealias ReaderSessionProtocol = any NFCNativeTagReaderSessionProtocol
     public typealias ReaderSessionDetectObject = [NFCTag]
     #endif
 }