Swift 6

Swift 6 and static properties.
Appracatappra · Jun 12, 2024 · a21b594 · a21b594
1 parent 5ce442c
commit a21b594
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/Sources/SwiftUIKit/Alerts/AlertTypes.swift b/Sources/SwiftUIKit/Alerts/AlertTypes.swift
@@ -35,7 +35,7 @@ open class AlertTypes: AlertState<AlertTypes.State> {
     /// Defines a type alias returned from a call to a CloudKit database function.
     public typealias AlertAction = () -> Void
 
-    public static var shared:AlertTypes = AlertTypes()
+    public nonisolated(unsafe) static var shared:AlertTypes = AlertTypes()
 
     // MARK: - Enumerations
     /// A list of the available Alerts that can be displayed in the App

diff --git a/Sources/SwiftUIKit/Components/CircleText.swift b/Sources/SwiftUIKit/Components/CircleText.swift
@@ -125,7 +125,7 @@ public struct WidthPreferenceKey: PreferenceKey {
 
     // MARK: - Properties
     /// The default value.
-    public static var defaultValue = CGFloat(0)
+    public nonisolated(unsafe) static var defaultValue = CGFloat(0)
 
     // MARK: - Computed Pproperties
     /// Reduces the given value.

diff --git a/Sources/SwiftUIKit/Components/IconButton.swift b/Sources/SwiftUIKit/Components/IconButton.swift
@@ -16,16 +16,16 @@ public struct IconButton: View {
 
     // MARK: - Static Properties
     /// The default background color for the `IconButton`.
-    static public var defaultBackgroundColor:Color = .gray
+    static public nonisolated(unsafe) var defaultBackgroundColor:Color = .gray
 
     /// The default sound source for the `IconButton`.
-    static public var defaultSoundSource:SwiftUIKit.Source = .packageBundle
+    static public nonisolated(unsafe) var defaultSoundSource:SwiftUIKit.Source = .packageBundle
 
     /// The default button clicked sound `IconButton`.
-    static public var defaultButtonSound:String = "mouse-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonSound:String = "mouse-click.mp3"
 
     /// The default focused sound for the `IconButton`.
-    static public var defaultButtonFocusSound:String = "diamond-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonFocusSound:String = "diamond-click.mp3"
 
 
     // MARK: - Properties

diff --git a/Sources/SwiftUIKit/Components/IconDescriptionButton.swift b/Sources/SwiftUIKit/Components/IconDescriptionButton.swift
@@ -13,16 +13,16 @@ public struct IconDescriptionButton: View {
 
     // MARK: - Static Properties
     /// The default background color for the `IconDescriptionButton`.
-    static public var defaultBackgroundColor:Color = .gray
+    static public nonisolated(unsafe) var defaultBackgroundColor:Color = .gray
 
     /// The default sound source for the `IconDescriptionButton`.
-    static public var defaultSoundSource:SwiftUIKit.Source = .packageBundle
+    static public nonisolated(unsafe) var defaultSoundSource:SwiftUIKit.Source = .packageBundle
 
     /// The default button clicked sound for the `IconDescriptionButton`.
-    static public var defaultButtonSound:String = "mouse-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonSound:String = "mouse-click.mp3"
 
     /// The defaut button focused sound for the `IconDescriptionButton`.
-    static public var defaultButtonFocusSound:String = "diamond-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonFocusSound:String = "diamond-click.mp3"
 
     // MARK: - Properties
     /// The icon to display on the button.

diff --git a/Sources/SwiftUIKit/Components/OnOffToggleButton.swift b/Sources/SwiftUIKit/Components/OnOffToggleButton.swift
@@ -15,19 +15,19 @@ public struct OnOffToggleButton: View {
 
     // MARK: - Static Properties
     /// The default on background color for the `OnOffToggleButton`.
-    static public var defaultOnBackgroundColor:Color = .green
+    static public nonisolated(unsafe) var defaultOnBackgroundColor:Color = .green
 
     /// The default off background color for the `OnOffToggleButton`.
-    static public var defaultOffBackgroundColor:Color = .red
+    static public nonisolated(unsafe) var defaultOffBackgroundColor:Color = .red
 
     /// The default sound source for the `OnOffToggleButton`.
-    static public var defaultSoundSource:SwiftUIKit.Source = .packageBundle
+    static public nonisolated(unsafe) var defaultSoundSource:SwiftUIKit.Source = .packageBundle
 
     /// The default clicked sound for the `OnOffToggleButton`.
-    static public var defaultButtonSound:String = "mouse-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonSound:String = "mouse-click.mp3"
 
     /// The default focused sound for the `OnOffToggleButton`.
-    static public var defaultButtonFocusSound:String = "diamond-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonFocusSound:String = "diamond-click.mp3"
 
     // MARK: - Properties
     /// The description for  the toggle.

diff --git a/Sources/SwiftUIKit/Components/ScaledImageButton.swift b/Sources/SwiftUIKit/Components/ScaledImageButton.swift
@@ -15,13 +15,13 @@ public struct ScaledImageButton: View {
 
     // MARK: - Static Properties
     /// The default sound source for the `ScaledImageButton`.
-    static public var defaultSoundSource:SwiftUIKit.Source = .packageBundle
+    static public nonisolated(unsafe) var defaultSoundSource:SwiftUIKit.Source = .packageBundle
 
     /// The default clicked sound for the `ScaledImageButton`.
-    static public var defaultButtonSound:String = "mouse-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonSound:String = "mouse-click.mp3"
 
     /// The default focused sound forr the `ScaledImageButton`.
-    static public var defaultButtonFocusSound:String = "diamond-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonFocusSound:String = "diamond-click.mp3"
 
     // MARK: - Properties
     /// The name of the image to display.

diff --git a/Sources/SwiftUIKit/Components/SelectIntOptionsButton.swift b/Sources/SwiftUIKit/Components/SelectIntOptionsButton.swift
@@ -13,16 +13,16 @@ public struct SelectIntOptionsButton: View {
 
     // MARK: - Static Properties
     /// The default background color for the `SelectIntOptionsButton`.
-    static public var defaultBackgroundColor:Color = .gray
+    static public nonisolated(unsafe) var defaultBackgroundColor:Color = .gray
 
     /// The default sound source for the `SelectIntOptionsButton`.
-    static public var defaultSoundSource:SwiftUIKit.Source = .packageBundle
+    static public nonisolated(unsafe) var defaultSoundSource:SwiftUIKit.Source = .packageBundle
 
     /// The default clicked sound for the`SelectIntOptionsButton`.
-    static public var defaultButtonSound:String = "mouse-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonSound:String = "mouse-click.mp3"
 
     /// The default focused sound for the `SelectIntOptionsButton`.
-    static public var defaultButtonFocusSound:String = "diamond-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonFocusSound:String = "diamond-click.mp3"
 
     // MARK: - Properties
     /// The icon for the button.

diff --git a/Sources/SwiftUIKit/Components/WordArtButton.swift b/Sources/SwiftUIKit/Components/WordArtButton.swift
@@ -16,13 +16,13 @@ public struct WordArtButton: View {
 
     // MARK: - Static Properties
     /// The default sound source for the `IconButton`.
-    static public var defaultSoundSource:SwiftUIKit.Source = .packageBundle
+    static public nonisolated(unsafe) var defaultSoundSource:SwiftUIKit.Source = .packageBundle
 
     /// The default button clicked sound `IconButton`.
-    static public var defaultButtonSound:String = "mouse-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonSound:String = "mouse-click.mp3"
 
     /// The default focused sound for the `IconButton`.
-    static public var defaultButtonFocusSound:String = "diamond-click.mp3"
+    static public nonisolated(unsafe) var defaultButtonFocusSound:String = "diamond-click.mp3"
 
     // MARK: - Properties
     /// The text for the wor art.

diff --git a/Sources/SwiftUIKit/Views/TouchLocatingView.swift b/Sources/SwiftUIKit/Views/TouchLocatingView.swift
@@ -20,16 +20,16 @@ public struct TouchLocatingView: UIViewRepresentable {
 
         // MARK: - Static Properties
         /// Has the touch started?
-        public static let started = TouchType(rawValue: 1 << 0)
+        public nonisolated(unsafe) static let started = TouchType(rawValue: 1 << 0)
 
         /// Has the touch moved?
-        public static let moved = TouchType(rawValue: 1 << 1)
+        public nonisolated(unsafe) static let moved = TouchType(rawValue: 1 << 1)
 
         /// Has the Touch Ended?
-        public static let ended = TouchType(rawValue: 1 << 2)
+        public nonisolated(unsafe) static let ended = TouchType(rawValue: 1 << 2)
 
         /// Holds all of the different touch types.
-        public static let all: TouchType = [.started, .moved, .ended]
+        public nonisolated(unsafe) static let all: TouchType = [.started, .moved, .ended]
 
         // MARK: - Properties
         /// The raw `Int` value.