Chip away at Swift 6

Author: STREGA

Package.swift

@@ -209,9 +209,7 @@ let package = Package(
                             .enableUpcomingFeature("DeprecateApplicationMain"),
 
                             .enableExperimentalFeature("AccessLevelOnImport"),
-//                            .enableExperimentalFeature("StrictConcurrency"),
-                            .enableExperimentalFeature("StrictConcurrency=minimal"),
-//                            .enableExperimentalFeature("StrictConcurrency=complete"),
+                            .enableExperimentalFeature("StrictConcurrency"),
                         ])
                         #if swift(>=6.2)
                         settings.append(.enableExperimentalFeature("IsolatedDeinit"))

Sources/GameMath/3D Types/3D Physics/3D Colliders/Triangles/CollisionAttributes.swift

@@ -96,7 +96,7 @@ public struct BasicCollisionAttributes: CollisionAttributesGroup {
         get { group1 }
         set { group1 = newValue }
     }
-    public struct FlagAttributes: CollisionAttributesType, OptionSet {
+    public struct FlagAttributes: CollisionAttributesType, OptionSet, Sendable {
         public typealias RawValue = UInt32
         public var rawValue: RawValue
         public init(rawValue: RawValue) {

Sources/GateEngine/System/Audio/Platforms/Backends/CoreAudio/CABufferReference.swift

@@ -38,7 +38,7 @@ internal final class CABufferReference: AudioBufferBackend {
         self.audioBuffer = audioBuffer
         Task.detached {
             do {
-                guard let located = await Game.shared.platform.locateResource(from: path) else {
+                guard let located = await Platform.current.locateResource(from: path) else {
                     throw GateEngineError.failedToLocate
                 }
                 do {  // Allow CoreAudio an chance to load files the way it prefers
@@ -57,7 +57,7 @@ internal final class CABufferReference: AudioBufferBackend {
                     // If CoreAudio can't load the file fallback to manual below and don't throw any errors
                 }
 
-                let data = try await Game.shared.platform.loadResource(from: path)
+                let data = try await Platform.current.loadResource(from: path)
                 #if canImport(Vorbis)
                 let lowercasePath = path.lowercased()
                 if lowercasePath.hasSuffix("ogg") || lowercasePath.hasSuffix("oga") {

Sources/GateEngine/System/Platforms/Platform Implementations/Apple/AppKit/AppKit/AppKitWindow.swift

@@ -210,7 +210,7 @@ final class AppKitWindow: WindowBacking {
         }
     }
 
-    nonisolated lazy var displayLink: CVDisplayLink = {
+    lazy var displayLink: CVDisplayLink = {
         var displayLink: CVDisplayLink?
         // Create a display link capable of being used with all active displays
         CVDisplayLinkCreateWithActiveCGDisplays(&displayLink)
@@ -222,8 +222,8 @@ final class AppKitWindow: WindowBacking {
                                        _ flagsIn: CVOptionFlags,
                                        _ flagsOut: UnsafeMutablePointer<CVOptionFlags>,
                                        _ displayLinkContext: UnsafeMutableRawPointer?) -> CVReturn {
-            let appKitWindow = unsafeBitCast(displayLinkContext, to: AppKitWindow.self)
             Task(priority: .high) { @MainActor in
+                let appKitWindow = unsafeBitCast(displayLinkContext, to: AppKitWindow.self)
                 if let view = appKitWindow.nsWindowController.window?.contentViewController?.view {
                     view.needsDisplay = true
                 }

Sources/GateEngine/System/Rendering/Drawables/Canvas.swift

@@ -541,7 +541,7 @@
     }
 }
 
-public struct CanvasElementSpriteFlags: OptionSet {
+public struct CanvasElementSpriteFlags: OptionSet, Sendable {
     public typealias RawValue = UInt32
     public let rawValue: RawValue
 
@@ -556,7 +556,7 @@ public struct CanvasElementSpriteFlags: OptionSet {
     }
 }
 
-public struct CanvasElementTextFlags: OptionSet {
+public struct CanvasElementTextFlags: OptionSet, Sendable {
     public typealias RawValue = UInt32
     public let rawValue: RawValue
 
@@ -571,7 +571,7 @@ public struct CanvasElementTextFlags: OptionSet {
     }
 }
 
-public struct CanvasElementPrimitiveFlags: OptionSet {
+public struct CanvasElementPrimitiveFlags: OptionSet, Sendable {
     public typealias RawValue = UInt32
     public let rawValue: RawValue
 

Sources/GateEngine/System/Rendering/Drawables/Scene.swift

@@ -445,7 +445,7 @@ internal struct SceneDirectionalLight: Hashable {
     }
 }
 
-public struct SceneElementFlags: OptionSet, Hashable {
+public struct SceneElementFlags: OptionSet, Hashable, Sendable {
     public typealias RawValue = UInt32
     public let rawValue: RawValue