Add Sendable annotations to public value types in RswiftResources

tomlokhorst · tomlokhorst · commit 24b1e15952be · 2024-10-06T20:16:35.000+02:00
diff --git a/Sources/RswiftResources/AssetCatalog.swift b/Sources/RswiftResources/AssetCatalog.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct AssetCatalog {
+public struct AssetCatalog: Sendable {
     public let filename: String
     public let root: Namespace
 
@@ -18,7 +18,7 @@ public struct AssetCatalog {
 }
 
 extension AssetCatalog {
-    public struct Namespace {
+    public struct Namespace: Sendable {
         public var subnamespaces: [String: Namespace] = [:]
         public var colors: [ColorResource] = []
         public var images: [ImageResource] = []
diff --git a/Sources/RswiftResources/ColorResource.swift b/Sources/RswiftResources/ColorResource.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ColorResource {
+public struct ColorResource: Sendable {
     public let name: String
     public let path: [String]
     public let bundle: Bundle
diff --git a/Sources/RswiftResources/DataResource.swift b/Sources/RswiftResources/DataResource.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct DataResource {
+public struct DataResource: Sendable {
     public let name: String
     public let path: [String]
     public let bundle: Bundle
diff --git a/Sources/RswiftResources/FileResource.swift b/Sources/RswiftResources/FileResource.swift
@@ -7,8 +7,7 @@
 
 import Foundation
 
-public struct FileResource {
-
+public struct FileResource: Sendable {
     public let name: String
     public let pathExtension: String
     public let bundle: Bundle
diff --git a/Sources/RswiftResources/FontResource.swift b/Sources/RswiftResources/FontResource.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct FontResource {
+public struct FontResource: Sendable {
     public let name: String
     public let bundle: Bundle
     public let filename: String
diff --git a/Sources/RswiftResources/ImageResource.swift b/Sources/RswiftResources/ImageResource.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ImageResource {
+public struct ImageResource: Sendable {
     public let name: String
     public let path: [String]
     public let bundle: Bundle
diff --git a/Sources/RswiftResources/NibResource.swift b/Sources/RswiftResources/NibResource.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct NibResource {
+public struct NibResource: Sendable {
     public let name: String
     public var locale: LocaleReference
     public let deploymentTarget: DeploymentTarget?
diff --git a/Sources/RswiftResources/Shared/DeploymentTarget.swift b/Sources/RswiftResources/Shared/DeploymentTarget.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct DeploymentTarget: Equatable {
+public struct DeploymentTarget: Equatable, Sendable {
     public typealias Version = (major: Int, minor: Int)
 
     public let version: Version?
diff --git a/Sources/RswiftResources/Shared/LocaleReference.swift b/Sources/RswiftResources/Shared/LocaleReference.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum LocaleReference: Hashable {
+public enum LocaleReference: Hashable, Sendable {
     case none
     case base // Older projects use a "Base" locale
     case language(String)
diff --git a/Sources/RswiftResources/Shared/ModuleReference.swift b/Sources/RswiftResources/Shared/ModuleReference.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum ModuleReference: Hashable {
+public enum ModuleReference: Hashable, Sendable {
     case host
     case stdLib
     case custom(name: String)
diff --git a/Sources/RswiftResources/Shared/NameCatalog.swift b/Sources/RswiftResources/Shared/NameCatalog.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct NameCatalog: Hashable, Comparable {
+public struct NameCatalog: Hashable, Comparable, Sendable {
     public let name: String
     public let catalog: String?
 
diff --git a/Sources/RswiftResources/Shared/Reusable.swift b/Sources/RswiftResources/Shared/Reusable.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Reusable: Hashable {
+public struct Reusable: Hashable, Sendable {
     public let identifier: String
     public let type: TypeReference
 
diff --git a/Sources/RswiftResources/Shared/StoryboardReference.swift b/Sources/RswiftResources/Shared/StoryboardReference.swift
@@ -25,7 +25,7 @@ public protocol InitialControllerContainer {
 
 
 /// Storyboard view controller identifier
-public struct StoryboardViewControllerIdentifier<ViewController> {
+public struct StoryboardViewControllerIdentifier<ViewController>: Sendable {
 
     /// Storyboard identifier of this view controller
     public let identifier: String
@@ -61,7 +61,7 @@ public protocol ReuseIdentifierContainer<Reusable> {
 }
 
 /// Nib reference
-public struct NibReference<FirstView>: NibReferenceContainer {
+public struct NibReference<FirstView>: NibReferenceContainer, Sendable {
 
     /// String name of this nib
     public let name: String
@@ -81,7 +81,7 @@ public struct NibReference<FirstView>: NibReferenceContainer {
 }
 
 /// Reuse identifier
-public struct ReuseIdentifier<Reusable>: ReuseIdentifierContainer {
+public struct ReuseIdentifier<Reusable>: ReuseIdentifierContainer, Sendable {
 
     /// String identifier of this reusable
     public let identifier: String
@@ -97,7 +97,7 @@ public struct ReuseIdentifier<Reusable>: ReuseIdentifierContainer {
 }
 
 /// Nib reference, reuse identifier
-public struct NibReferenceReuseIdentifier<FirstView, Reusable>: NibReferenceContainer, ReuseIdentifierContainer {
+public struct NibReferenceReuseIdentifier<FirstView, Reusable>: NibReferenceContainer, ReuseIdentifierContainer, Sendable {
 
     /// String name of this nib
     public let name: String
@@ -122,7 +122,7 @@ public struct NibReferenceReuseIdentifier<FirstView, Reusable>: NibReferenceCont
 }
 
 /// Segue identifier
-public struct SegueIdentifier<Segue, Source, Destination> {
+public struct SegueIdentifier<Segue, Source, Destination>: Sendable {
 
     /// Identifier string of this segue
     public let identifier: String
@@ -168,6 +168,7 @@ public struct TypedSegue<Segue, Source, Destination> {
     }
 }
 
+extension TypedSegue: Sendable where Segue: Sendable, Source: Sendable, Destination: Sendable {}
 
 @available(*, renamed: "ReuseIdentifierContainer")
 public protocol ReuseIdentifierType {}
diff --git a/Sources/RswiftResources/Shared/StringParam.swift b/Sources/RswiftResources/Shared/StringParam.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct StringParam: Equatable {
+public struct StringParam: Equatable, Sendable {
     public let name: String?
     public let spec: FormatSpecifier
 
@@ -17,7 +17,7 @@ public struct StringParam: Equatable {
     }
 }
 
-public enum FormatPart {
+public enum FormatPart: Sendable {
     case spec(FormatSpecifier)
     case reference(String)
 
@@ -33,7 +33,7 @@ public enum FormatPart {
 }
 
 // https://developer.apple.com/library/ios/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html#//apple_ref/doc/uid/TP40004265-SW1
-public enum FormatSpecifier {
+public enum FormatSpecifier: Sendable {
     case object
     case double
     case int
diff --git a/Sources/RswiftResources/Shared/StringsTable.swift b/Sources/RswiftResources/Shared/StringsTable.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct StringsTable {
+public struct StringsTable: Sendable {
     public let filename: String
     public let locale: LocaleReference
     public let dictionary: [Key: Value]
@@ -19,7 +19,7 @@ public struct StringsTable {
     }
 
     public typealias Key = String
-    public struct Value {
+    public struct Value: Sendable {
         public let params: [StringParam]
         public let originalValue: String
 
diff --git a/Sources/RswiftResources/Shared/TypeReference.swift b/Sources/RswiftResources/Shared/TypeReference.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct TypeReference: Hashable {
+public struct TypeReference: Hashable, Sendable {
     public let module: ModuleReference
     public let name: String
     public var genericArgs: [TypeReference]
diff --git a/Sources/RswiftResources/Shared/ValidationError.swift b/Sources/RswiftResources/Shared/ValidationError.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// Error thrown during validation
-public struct ValidationError: Error, CustomStringConvertible {
+public struct ValidationError: Error, CustomStringConvertible, Sendable {
     /// Human readable description
     public let description: String
 
diff --git a/Sources/RswiftResources/StoryboardResource.swift b/Sources/RswiftResources/StoryboardResource.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct StoryboardResource: Equatable {
+public struct StoryboardResource: Equatable, Sendable {
     public let name: String
     public var locale: LocaleReference
     public let deploymentTarget: DeploymentTarget?
@@ -49,7 +49,7 @@ public struct StoryboardResource: Equatable {
         self.isAppKit = isAppKit
     }
 
-    public struct ViewController: Equatable {
+    public struct ViewController: Equatable, Sendable {
         public let id: String
         public let storyboardIdentifier: String?
         public let type: TypeReference
@@ -63,7 +63,7 @@ public struct StoryboardResource: Equatable {
         }
     }
 
-    public struct ViewControllerPlaceholder: Equatable {
+    public struct ViewControllerPlaceholder: Equatable, Sendable {
         public let id: String
         public let storyboardName: String?
         public let referencedIdentifier: String?
@@ -77,7 +77,7 @@ public struct StoryboardResource: Equatable {
         }
     }
 
-    public struct Segue: Equatable {
+    public struct Segue: Equatable, Sendable {
         public let identifier: String
         public let type: TypeReference
         public let destination: String
diff --git a/Sources/RswiftResources/StringResource.swift b/Sources/RswiftResources/StringResource.swift
@@ -7,8 +7,8 @@
 
 import Foundation
 
-public struct StringResource {
-    public enum Source {
+public struct StringResource: Sendable {
+    public enum Source: Sendable {
         case hosting(Bundle)
         case selected(Bundle, Locale)
         case none
@@ -37,7 +37,7 @@ public struct StringResource {
     }
 }
 
-public struct StringResource1<Arg1: CVarArg> {
+public struct StringResource1<Arg1: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -53,7 +53,7 @@ public struct StringResource1<Arg1: CVarArg> {
     }
 }
 
-public struct StringResource2<Arg1: CVarArg, Arg2: CVarArg> {
+public struct StringResource2<Arg1: CVarArg, Arg2: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -69,7 +69,7 @@ public struct StringResource2<Arg1: CVarArg, Arg2: CVarArg> {
     }
 }
 
-public struct StringResource3<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg> {
+public struct StringResource3<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -85,7 +85,7 @@ public struct StringResource3<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg> {
     }
 }
 
-public struct StringResource4<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg> {
+public struct StringResource4<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -101,7 +101,7 @@ public struct StringResource4<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4:
     }
 }
 
-public struct StringResource5<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg> {
+public struct StringResource5<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -117,7 +117,7 @@ public struct StringResource5<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4:
     }
 }
 
-public struct StringResource6<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg> {
+public struct StringResource6<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -133,7 +133,7 @@ public struct StringResource6<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4:
     }
 }
 
-public struct StringResource7<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg, Arg7: CVarArg> {
+public struct StringResource7<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg, Arg7: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -149,7 +149,7 @@ public struct StringResource7<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4:
     }
 }
 
-public struct StringResource8<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg, Arg7: CVarArg, Arg8: CVarArg> {
+public struct StringResource8<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg, Arg7: CVarArg, Arg8: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
@@ -165,7 +165,7 @@ public struct StringResource8<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4:
     }
 }
 
-public struct StringResource9<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg, Arg7: CVarArg, Arg8: CVarArg, Arg9: CVarArg> {
+public struct StringResource9<Arg1: CVarArg, Arg2: CVarArg, Arg3: CVarArg, Arg4: CVarArg, Arg5: CVarArg, Arg6: CVarArg, Arg7: CVarArg, Arg8: CVarArg, Arg9: CVarArg>: Sendable {
     public let key: StaticString
     public let tableName: String
     public let source: StringResource.Source
