Adopt swift 6

oversizedev · Nov 1, 2024 · 615323d · 615323d
1 parent afe8d0a
commit 615323d
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 27 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,8 +1,8 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
-import PackageDescription
 import Foundation
+import PackageDescription
 
 let remoteDependencies: [PackageDescription.Package.Dependency] = [
     .package(url: "https://github.com/oversizedev/OversizeLocalizable.git", .upToNextMajor(from: "1.5.0")),

diff --git a/Sources/OversizeModels/Config/AppConfig.swift b/Sources/OversizeModels/Config/AppConfig.swift
@@ -5,29 +5,29 @@
 
 import Foundation
 
-public struct PlistConfiguration: Codable {
+public struct PlistConfiguration: Codable, Sendable {
     public var store: Store
     public var apps: [App]
     public var links: Links
 
-    private enum CodingKeys: String, CodingKey {
+    private enum CodingKeys: String, CodingKey, Sendable {
         case store = "Store"
         case apps = "Apps"
         case links = "Links"
     }
 
-    public struct Links: Codable {
+    public struct Links: Codable, Sendable {
         public var app: App
         public var developer: Developer
         public var company: Company
 
-        private enum CodingKeys: String, CodingKey {
+        private enum CodingKeys: String, CodingKey, Sendable {
             case app = "App"
             case developer = "Developer"
             case company = "Company"
         }
 
-        public struct App: Codable, Hashable {
+        public struct App: Codable, Hashable, Sendable {
             public var urlString: String?
             public var telegramChat: String?
             public var appStoreId: String
@@ -67,21 +67,21 @@ public struct PlistConfiguration: Codable {
                 return url
             }
 
-            private enum CodingKeys: String, CodingKey {
+            private enum CodingKeys: String, CodingKey, Sendable {
                 case urlString = "Url"
                 case telegramChat = "TelegramChat"
                 case appStoreId = "AppStoreID"
             }
         }
 
-        public struct Developer: Codable, Hashable {
+        public struct Developer: Codable, Hashable, Sendable {
             public var name: String?
             public var url: String?
             public var email: String?
             public var fecebook: String?
             public var telegram: String?
 
-            private enum CodingKeys: String, CodingKey {
+            private enum CodingKeys: String, CodingKey, Sendable {
                 case name = "Name"
                 case url = "Url"
                 case email = "Email"
@@ -90,7 +90,7 @@ public struct PlistConfiguration: Codable {
             }
         }
 
-        public struct Company: Codable, Hashable {
+        public struct Company: Codable, Hashable, Sendable {
             public var name: String?
             public var urlString: String?
             public var email: String?
@@ -134,7 +134,7 @@ public struct PlistConfiguration: Codable {
         }
     }
 
-    public struct App: Codable, Identifiable, Hashable {
+    public struct App: Codable, Identifiable, Hashable, Sendable {
         public var id: String
         public var name: String?
         public var title: String?
@@ -149,14 +149,14 @@ public struct PlistConfiguration: Codable {
         }
     }
 
-    public struct Store: Codable {
+    public struct Store: Codable, Sendable {
         public var features: [StoreFeature]
 
-        private enum CodingKeys: String, CodingKey {
+        private enum CodingKeys: String, CodingKey, Sendable {
             case features = "Features"
         }
 
-        public struct StoreFeature: Codable, Identifiable, Hashable, Equatable {
+        public struct StoreFeature: Codable, Identifiable, Hashable, Equatable, Sendable {
             public var id: String {
                 (image ?? "") + (title ?? "") + (subtitle ?? "")
             }

diff --git a/Sources/OversizeModels/Error/AppError.swift b/Sources/OversizeModels/Error/AppError.swift
@@ -12,7 +12,7 @@ public protocol AppErrorProtocol {
     var icon: Image? { get }
 }
 
-public enum AppError: Error {
+public enum AppError: Error, Sendable {
     case network(type: Enums.NetworkError)
     case cloudKit(type: Enums.CloudKit)
     case location(type: Enums.Location)

diff --git a/Sources/OversizeModels/Error/CloudDocumentsErrors.swift b/Sources/OversizeModels/Error/CloudDocumentsErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum CloudDocuments {
+    enum CloudDocuments: Sendable {
         case deleteItem
         case updateItem
         case savingItem

diff --git a/Sources/OversizeModels/Error/CloudKitErrors.swift b/Sources/OversizeModels/Error/CloudKitErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum CloudKit {
+    enum CloudKit: Sendable {
         case decode
         case noAccount
         case notAccess

diff --git a/Sources/OversizeModels/Error/ContactsErrors.swift b/Sources/OversizeModels/Error/ContactsErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum Contacts {
+    enum Contacts: Sendable {
         case notAccess
         case unknown
     }

diff --git a/Sources/OversizeModels/Error/CoreDataErrors.swift b/Sources/OversizeModels/Error/CoreDataErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum CoreData {
+    enum CoreData: Sendable {
         case deleteItem
         case updateItem
         case savingItem

diff --git a/Sources/OversizeModels/Error/EventKitErrors.swift b/Sources/OversizeModels/Error/EventKitErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum EventKit {
+    enum EventKit: Sendable {
         case deleteItem
         case updateItem
         case savingItem

diff --git a/Sources/OversizeModels/Error/FileManagerError.swift b/Sources/OversizeModels/Error/FileManagerError.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum FileManager {
+    enum FileManager: Sendable {
         case deleteItem
         case updateItem
         case savingItem

diff --git a/Sources/OversizeModels/Error/HealthKitErrors.swift b/Sources/OversizeModels/Error/HealthKitErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum HealthKit {
+    enum HealthKit: Sendable {
         case deleteItem
         case updateItem
         case savingItem

diff --git a/Sources/OversizeModels/Error/LocationErrors.swift b/Sources/OversizeModels/Error/LocationErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum Location {
+    enum Location: Sendable {
         case notDetermined
         case notAccess
         case unknown

diff --git a/Sources/OversizeModels/Error/NetworkErrors.swift b/Sources/OversizeModels/Error/NetworkErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum NetworkError {
+    enum NetworkError: Sendable {
         case decode
         case invalidURL
         case noResponse

diff --git a/Sources/OversizeModels/Error/NotificationsErrors.swift b/Sources/OversizeModels/Error/NotificationsErrors.swift
@@ -7,7 +7,7 @@ import OversizeLocalizable
 import SwiftUI
 
 public extension AppError.Enums {
-    enum Notification {
+    enum Notification: Sendable {
         case notDetermined
         case notAccess
         case unknown

diff --git a/Sources/OversizeModels/SwiftData/ColorData.swift b/Sources/OversizeModels/SwiftData/ColorData.swift
@@ -5,7 +5,7 @@
 
 import SwiftUI
 
-public struct ColorData: Codable {
+public struct ColorData: Codable, Sendable {
     private var red: Double = 1
     private var green: Double = 1
     private var blue: Double = 1