ab180 · minjae999 · Aug 21, 2026 · Aug 21, 2026 · Aug 21, 2026 · Aug 21, 2026
diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,14 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 6.0
 import PackageDescription
 
 var package = Package(
     name: "Saby",
     platforms: [
-        .iOS(.v12),
-        .macOS(.v10_15),
-        .tvOS(.v13),
-        .watchOS(.v6),
+        .iOS(.v15),
+        .macOS(.v14),
+        .tvOS(.v15),
+        .watchOS(.v8),
+        .visionOS(.v1)
     ],
     products: [
         .library(
@@ -19,9 +20,6 @@ var package = Package(
         .library(
             name: "SabyESCArchitecture",
             targets: ["SabyESCArchitecture"]),
-        .library(
-            name: "SabyTestExpect",
-            targets: ["SabyTestExpect"]),
         .library(
             name: "SabyJSON",
             targets: ["SabyJSON"]),
@@ -65,10 +63,6 @@ var package = Package(
             name: "SabyESCArchitecture",
             dependencies: ["SabyConcurrency"],
             path: "Source/ESCArchitecture"),
-        .target(
-            name: "SabyTestExpect",
-            dependencies: ["SabyConcurrency"],
-            path: "Source/TestExpect"),
         .target(
             name: "SabyTestWait",
             dependencies: ["SabyConcurrency", "SabyTestMock"],
@@ -79,7 +73,7 @@ var package = Package(
             path: "Source/JSON"),
         .target(
             name: "SabyTestMock",
-            dependencies: ["SabyConcurrency", "SabyJSON"],
+            dependencies: ["SabyConcurrency"],
             path: "Source/TestMock"),
         .target(
             name: "SabyTestFake",
@@ -107,7 +101,7 @@ var package = Package(
             path: "Source/Time"),
         .testTarget(
             name: "SabyConcurrencyTest",
-            dependencies: ["SabyConcurrency", "SabyTestWait"],
+            dependencies: ["SabyConcurrency"],
             path: "Test/Concurrency"),
         .testTarget(
             name: "SabyEncodeTest",
@@ -119,7 +113,7 @@ var package = Package(
             path: "Test/JSON"),
         .testTarget(
             name: "SabyNetworkTest",
-            dependencies: ["SabyNetwork", "SabyTestMock", "SabyTestExpect"],
+            dependencies: ["SabyNetwork", "SabyConcurrency", "SabyJSON"],
             path: "Test/Network"),
         .testTarget(
             name: "SabyNumericTest",
@@ -140,7 +134,7 @@ var package = Package(
     ]
 )
 
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(visionOS)
 package
     .products.append(contentsOf: [
         .library(
@@ -189,7 +183,7 @@ package
             path: "Source/AppleStorage"),
         .target(
             name: "SabyApplePreference",
-            dependencies: ["SabyConcurrency", "SabyJSON"],
+            dependencies: ["SabyJSON"],
             path: "Source/ApplePreference"),
         .target(
             name: "SabyAppleTracker",
@@ -209,7 +203,7 @@ package
             path: "Test/AppleCrypto"),
         .testTarget(
             name: "SabyAppleStorageTest",
-            dependencies: ["SabyAppleStorage", "SabyTestWait"],
+            dependencies: ["SabyAppleStorage"],
             path: "Test/AppleStorage"),
         .testTarget(
             name: "SabyApplePreferenceTest",

diff --git a/Source/AppleCrypto/Hash.swift b/Source/AppleCrypto/Hash.swift
diff --git a/Source/AppleCrypto/Implement/HMAC.swift b/Source/AppleCrypto/Implement/HMAC.swift
@@ -5,12 +5,12 @@
 //  Created by WOF on 2023/06/13.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if (os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(visionOS)) && canImport(Foundation) && canImport(CommonCrypto)
 
 import Foundation
 import CommonCrypto
 
-public enum HMAC: MessageAuthenticationCode {
+public enum HMAC {
     public static func code(message: String, key: String, hash: Hash) -> String {
         var result = Array<UInt8>(repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
 

diff --git a/Source/AppleCrypto/Implement/SHA256.swift b/Source/AppleCrypto/Implement/SHA256.swift
@@ -5,12 +5,12 @@
 //  Created by WOF on 2023/02/17.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if (os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(visionOS)) && canImport(Foundation) && canImport(CommonCrypto)
 
 import Foundation
 import CommonCrypto
 
-public enum SHA256: Hash {
+public enum SHA256 {
     public static func hash(message: String) -> String {
         var result = Array<UInt8>(repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
 

diff --git a/Source/AppleCrypto/Implement/TOTP.swift b/Source/AppleCrypto/Implement/TOTP.swift
@@ -5,13 +5,13 @@
 //  Created by WOF on 2023/06/13.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if (os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(visionOS)) && canImport(Foundation) && canImport(CommonCrypto)
 
 import Foundation
 import CommonCrypto
 import SabyTime
 
-public enum TOTP: OneTimePassword {
+public enum TOTP {
     public static func password(
         timestamp: Timestamp,
         key: String,
@@ -77,31 +77,13 @@ extension TOTP {
 
 extension TOTP {
     public enum Digit: Int {
-        case digit0 = 0
-        case digit1
-        case digit2
-        case digit3
-        case digit4
-        case digit5
-        case digit6
-        case digit7
-        case digit8
+        case digit8 = 8
     }
 }
 
 extension TOTP.Digit {
     var mask: UInt32 {
-        switch self {
-        case .digit0: return 1
-        case .digit1: return 10
-        case .digit2: return 100
-        case .digit3: return 1000
-        case .digit4: return 10000
-        case .digit5: return 100000
-        case .digit6: return 1000000
-        case .digit7: return 10000000
-        case .digit8: return 100000000
-        }
+        100000000
     }
 }
 

diff --git a/Source/AppleCrypto/MessageAuthenticationCode.swift b/Source/AppleCrypto/MessageAuthenticationCode.swift
diff --git a/Source/AppleCrypto/OneTimePassword.swift b/Source/AppleCrypto/OneTimePassword.swift
diff --git a/Source/AppleFetcher/Alias/Fetcher/FetcherProtocol.swift b/Source/AppleFetcher/Alias/Fetcher/FetcherProtocol.swift
@@ -8,6 +8,5 @@
 import Foundation
 
 extension Fetcher {
-    public typealias SelfProtocol = Fetcher<Self.Value>
     public typealias AnyProtocol = any Fetcher<Self.Value>
 }
diff --git a/Source/AppleFetcher/Fetcher.swift b/Source/AppleFetcher/Fetcher.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public protocol Fetcher<Value> {
+public protocol Fetcher<Value>: Sendable {
     associatedtype Value
 
     func fetch() -> Value

diff --git a/Source/AppleFetcher/Implement/AppFetcher.swift b/Source/AppleFetcher/Implement/AppFetcher.swift
@@ -5,7 +5,7 @@
 //  Created by WOF on 2022/08/24.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(visionOS)
 
 import Foundation
 

diff --git a/Source/AppleFetcher/Implement/AppleAdsAttributionTokenFetcher.swift b/Source/AppleFetcher/Implement/AppleAdsAttributionTokenFetcher.swift
@@ -5,7 +5,7 @@
 //  Created by WOF on 2022/08/22.
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 
 import Foundation
 
@@ -24,16 +24,17 @@ public final class AppleAdsAttributionTokenFetcher: Fetcher {
     }
 
     public func fetch() -> Promise<AppleAdsAttributionToken, Error> {
-        Promise.async {
-            try self.classAAAttribution.attributionToken()
+        let classAAAttribution = self.classAAAttribution
+
+        return Promise.async {
+            try await classAAAttribution.attributionToken()
         }
     }
 }
 
 public typealias AppleAdsAttributionToken = String
 
-private final class ClassAAAttribution {
-    private let classAAAttribution: NSObjectClass
+private actor ClassAAAttribution {
     private let methodAttributionTokenWithError: NSObjectClassMethod
 
     init?() {
@@ -48,7 +49,6 @@ private final class ClassAAAttribution {
             return nil
         }
 
-        self.classAAAttribution = classAAAttribution
         self.methodAttributionTokenWithError = methodAttributionTokenWithError
     }
 

diff --git a/Source/AppleFetcher/Implement/CarrierFetcher.swift b/Source/AppleFetcher/Implement/CarrierFetcher.swift
@@ -5,7 +5,7 @@
 //  Created by WOF on 2022/08/24.
 //
 
-#if os(iOS)
+#if os(iOS) && canImport(CoreTelephony)
 
 import Foundation
 import CoreTelephony
@@ -35,14 +35,11 @@ public struct Carrier {
 extension CarrierFetcher {
     private func fetchCTCarrier() -> CTCarrier? {
         let information = CTTelephonyNetworkInfo()
-        if #available(iOS 12.0, *) {
-            return information
-                .serviceSubscriberCellularProviders?
-                .values
-                .first { $0.carrierName != nil }
-        } else {
-            return information.subscriberCellularProvider
-        }
+
+        return information
+            .serviceSubscriberCellularProviders?
+            .values
+            .first { $0.carrierName != nil }
     }
 }
 

diff --git a/Source/AppleFetcher/Implement/CoarseLocationFetcher.swift b/Source/AppleFetcher/Implement/CoarseLocationFetcher.swift
@@ -5,7 +5,7 @@
 //  Created by WOF on 2022/08/23.
 //
 
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(visionOS)
 
 import Foundation
 
@@ -65,7 +65,8 @@ extension CoarseLocationFetcher {
     }
 
     private func fetchRegion() -> String? {
-        Locale.autoupdatingCurrent.regionCode
+        (Locale.autoupdatingCurrent as NSLocale)
+            .object(forKey: .countryCode) as? String
     }
 }
 

diff --git a/Source/AppleFetcher/Implement/IdentifierForVendorFetcher.swift b/Source/AppleFetcher/Implement/IdentifierForVendorFetcher.swift
@@ -5,31 +5,31 @@
 //  Created by WOF on 2022/08/25.
 //
 
-#if os(iOS) || os(tvOS)
+#if (os(iOS) || os(tvOS) || os(visionOS)) && canImport(UIKit)
 
 import Foundation
 import UIKit
 
+import SabyConcurrency
+
 public final class IdentifierForVendorFetcher: Fetcher {
-    public typealias Value = IdentifierForVendor
+    public typealias Value = Promise<IdentifierForVendor, Never>
 
     public init() {}
 
-    public func fetch() -> IdentifierForVendor {
-        IdentifierForVendor(
-            identifier: fetchIdentifier()
-        )
+    public func fetch() -> Promise<IdentifierForVendor, Never> {
+        Promise.async {
+            await MainActor.run {
+                IdentifierForVendor(
+                    identifier: UIDevice.current.identifierForVendor?.uuidString
+                )
+            }
+        }
     }
 }
 
-public struct IdentifierForVendor {
+public struct IdentifierForVendor: Sendable {
     public let identifier: String?
 }
 
-extension IdentifierForVendorFetcher {
-    private func fetchIdentifier() -> String? {
-        UIDevice.current.identifierForVendor?.uuidString
-    }
-}
-
 #endif