Fix errors when using Swift 6 strict concurrency checking

dylanmaryk · Matty Cross · commit ca4c4d8cf067 · 2025-02-18T17:29:02.000+01:00
diff --git a/.package.resolved b/.package.resolved
@@ -1,16 +1,123 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "OCMock",
-        "repositoryURL": "https://github.com/erikdoe/ocmock.git",
-        "state": {
-          "branch": null,
-          "revision": "2c0bfd373289f4a7716db5d6db471640f91a6507",
-          "version": null
-        }
-      }
-    ]
-  },
-  "version": 1
+  "originHash" : "a64ff5917cc2a5d0406bc10508197e31aa8e7eaacbc9e999a52bea35093394de",
+  "pins" : [
+    {
+      "identity" : "aexml",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tadija/AEXML.git",
+      "state" : {
+        "revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
+        "version" : "4.6.1"
+      }
+    },
+    {
+      "identity" : "filekit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/nvzqz/FileKit.git",
+      "state" : {
+        "revision" : "9006d2888025fbe893c3c396327b2fe45a8c177b",
+        "version" : "6.1.0"
+      }
+    },
+    {
+      "identity" : "pathkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kylef/PathKit.git",
+      "state" : {
+        "revision" : "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
+        "version" : "1.0.1"
+      }
+    },
+    {
+      "identity" : "rainbow",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Rainbow",
+      "state" : {
+        "revision" : "e0dada9cd44e3fa7ec3b867e49a8ddbf543e3df3",
+        "version" : "4.0.1"
+      }
+    },
+    {
+      "identity" : "spectre",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kylef/Spectre.git",
+      "state" : {
+        "revision" : "26cc5e9ae0947092c7139ef7ba612e34646086c7",
+        "version" : "0.10.1"
+      }
+    },
+    {
+      "identity" : "stencil",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kylef/Stencil.git",
+      "state" : {
+        "revision" : "4f222ac85d673f35df29962fc4c36ccfdaf9da5b",
+        "version" : "0.15.1"
+      }
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser",
+      "state" : {
+        "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
+        "version" : "1.2.3"
+      }
+    },
+    {
+      "identity" : "swift-cmark",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-cmark.git",
+      "state" : {
+        "revision" : "f218e5d7691f78b55bfa39b367763f4612486c35",
+        "version" : "0.3.0"
+      }
+    },
+    {
+      "identity" : "swift-format",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-format.git",
+      "state" : {
+        "revision" : "83248b4fa37919f78ffbd4650946759bcc54c2b5",
+        "version" : "509.0.0"
+      }
+    },
+    {
+      "identity" : "swift-markdown",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-markdown.git",
+      "state" : {
+        "revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378",
+        "version" : "0.3.0"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax.git",
+      "state" : {
+        "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
+        "version" : "509.0.0"
+      }
+    },
+    {
+      "identity" : "tomlkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/LebJe/TOMLKit.git",
+      "state" : {
+        "revision" : "404c4dd011743461bff12d00a5118d0ed59d630c",
+        "version" : "0.5.5"
+      }
+    },
+    {
+      "identity" : "xcodeproj",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tuist/XcodeProj.git",
+      "state" : {
+        "revision" : "3797181813ee963fe305d939232bc576d23ddbb0",
+        "version" : "8.15.0"
+      }
+    }
+  ],
+  "version" : 3
 }
diff --git a/Cuckoo.podspec b/Cuckoo.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target   = '8.0'
   s.tvos.deployment_target      = '13.0'
   generator_name                = 'cuckoonator'
-  s.swift_version               = '5.0'
+  s.swift_version               = '6.0'
   s.preserve_paths              = ['Generator/**/*', 'version', 'run', 'build_generator', generator_name]
   s.prepare_command             = <<-CMD
                                     curl -Lo #{generator_name} https://github.com/Brightify/Cuckoo/releases/download/#{s.version}/#{generator_name}
diff --git a/Generator/Sources/CLI/GenerateCommand.swift b/Generator/Sources/CLI/GenerateCommand.swift
@@ -1,12 +1,12 @@
 import Foundation
 import ArgumentParser
 import TOMLKit
-import FileKit
+@preconcurrency import FileKit
 
 @main
 @available(macOS 12, *)
 struct GenerateCommand: AsyncParsableCommand {
-    static var configuration = CommandConfiguration(
+    nonisolated(unsafe) static var configuration = CommandConfiguration(
         commandName: "Generate",
         abstract: "Cuckoo CLI tool for generating mocks according to the specified configuration.",
         version: version,
diff --git a/Generator/Sources/CLI/Generator.swift b/Generator/Sources/CLI/Generator.swift
@@ -1,5 +1,5 @@
 import Foundation
-import FileKit
+@preconcurrency import FileKit
 import XcodeProj
 import Rainbow
 
diff --git a/Generator/Sources/CLI/Glob.swift b/Generator/Sources/CLI/Glob.swift
@@ -26,7 +26,7 @@ final class Glob: Collection {
         let includesFilesInResultsIfTrailingSlash: Bool
     }
 
-    static var defaultBehavior = Glob.Behavior(
+    static let defaultBehavior = Glob.Behavior(
         supportsGlobstar: true,
         includesFilesFromRootOfGlobstar: true,
         includesDirectoriesInResults: false,
diff --git a/Generator/Sources/CLI/Logger.swift b/Generator/Sources/CLI/Logger.swift
@@ -7,7 +7,7 @@ final class Logger {
         case error
     }
 
-    static let shared = Logger()
+    nonisolated(unsafe) static let shared = Logger()
 
     var logLevel: LogLevel = .info
 
diff --git a/Generator/Sources/CLI/Module.swift b/Generator/Sources/CLI/Module.swift
@@ -1,8 +1,8 @@
 import Foundation
 import FileKit
 
-final class Module {
-    static var overriddenOutput: String?
+final class Module: @unchecked Sendable {
+    nonisolated(unsafe) static var overriddenOutput: String?
 
     let name: String
     let imports: [String]
diff --git a/Generator/Sources/Internal/Helpers/Async+convenience.swift b/Generator/Sources/Internal/Helpers/Async+convenience.swift
@@ -40,9 +40,9 @@ extension Sequence {
     }
 }
 
-extension Sequence {
+extension Sequence where Element: Sendable {
     func concurrentForEach(
-        _ operation: @escaping (Element) async -> Void
+        _ operation: @escaping @Sendable (Element) async -> Void
     ) async {
         // A task group automatically waits for all of its
         // sub-tasks to complete, while also performing those
@@ -67,9 +67,9 @@ extension Sequence {
     }
 }
 
-extension Sequence {
-    func concurrentMap<T>(
-        _ transform: @escaping (Element) async throws -> T
+extension Sequence where Element: Sendable {
+    func concurrentMap<T: Sendable>(
+        _ transform: @escaping @Sendable (Element) async throws -> T
     ) async rethrows -> [T] {
         let tasks = map { element in
             Task {
@@ -82,8 +82,8 @@ extension Sequence {
         }
     }
 
-    func concurrentCompactMap<T>(
-        _ transform: @escaping (Element) async throws -> T?
+    func concurrentCompactMap<T: Sendable>(
+        _ transform: @escaping @Sendable (Element) async throws -> T?
     ) async rethrows -> [T] {
         let tasks = map { element in
             Task {
diff --git a/Generator/Sources/Internal/Tokens/FileRepresentation.swift b/Generator/Sources/Internal/Tokens/FileRepresentation.swift
@@ -1,7 +1,7 @@
 import Foundation
 import FileKit
 
-struct FileRepresentation {
+struct FileRepresentation: @unchecked Sendable {
     let file: TextFile
     let imports: [Import]
     let tokens: [Token]
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:6.0
 
 import PackageDescription
 
diff --git a/Source/DefaultValueRegistry.swift b/Source/DefaultValueRegistry.swift
@@ -1,6 +1,6 @@
 public class DefaultValueRegistry {
     
-    private static let defaultRegisteredTypes: [ObjectIdentifier: Any] = [
+    nonisolated(unsafe) private static let defaultRegisteredTypes: [ObjectIdentifier: Any] = [
         ObjectIdentifier(Void.self): Void(),
         ObjectIdentifier(Int.self): Int(),
         ObjectIdentifier(Int8.self): Int8(),
@@ -18,7 +18,7 @@ public class DefaultValueRegistry {
         ObjectIdentifier(Float.self): Float()
     ]
     
-    private static var registeredTypes = defaultRegisteredTypes
+    nonisolated(unsafe) private static var registeredTypes = defaultRegisteredTypes
     
     public static func register<T>(value: T, forType type: T.Type) {
         registeredTypes[ObjectIdentifier(type)] = value
diff --git a/Source/Initialization/MockManager+preconfigured.swift b/Source/Initialization/MockManager+preconfigured.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension MockManager {
-    internal static let preconfiguredManagerThreadLocal = ThreadLocal<MockManager>()
+    nonisolated(unsafe) internal static let preconfiguredManagerThreadLocal = ThreadLocal<MockManager>()
 
     public static var preconfiguredManager: MockManager? {
         preconfiguredManagerThreadLocal.value
diff --git a/Source/MockManager.swift b/Source/MockManager.swift
@@ -6,7 +6,7 @@ import XCTest
 #endif
 
 public class MockManager {
-    public static var fail: ((message: String, sourceLocation: SourceLocation)) -> Void = { arg in
+    nonisolated(unsafe) public static var fail: ((message: String, sourceLocation: SourceLocation)) -> Void = { arg in
         let (message, sourceLocation) = arg
         #if canImport(XCTest)
         XCTFail(message, file: sourceLocation.file, line: UInt(sourceLocation.line))

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class Glob: Collection {`
`26`	`26`	`let includesFilesInResultsIfTrailingSlash: Bool`
`27`	`27`	`}`
`28`	`28`
`29`		`- static var defaultBehavior = Glob.Behavior(`
	`29`	`+ static let defaultBehavior = Glob.Behavior(`
`30`	`30`	`supportsGlobstar: true,`
`31`	`31`	`includesFilesFromRootOfGlobstar: true,`
`32`	`32`	`includesDirectoriesInResults: false,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ final class Logger {`
`7`	`7`	`case error`
`8`	`8`	`}`
`9`	`9`
`10`		`- static let shared = Logger()`
	`10`	`+ nonisolated(unsafe) static let shared = Logger()`
`11`	`11`
`12`	`12`	`var logLevel: LogLevel = .info`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ extension Sequence {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-extension Sequence {`
	`43`	`+extension Sequence where Element: Sendable {`
`44`	`44`	`func concurrentForEach(`
`45`		`- _ operation: @escaping (Element) async -> Void`
	`45`	`+ _ operation: @escaping @Sendable (Element) async -> Void`
`46`	`46`	`) async {`
`47`	`47`	`// A task group automatically waits for all of its`
`48`	`48`	`// sub-tasks to complete, while also performing those`
`@@ -67,9 +67,9 @@ extension Sequence {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-extension Sequence {`
`71`		`- func concurrentMap<T>(`
`72`		`- _ transform: @escaping (Element) async throws -> T`
	`70`	`+extension Sequence where Element: Sendable {`
	`71`	`+ func concurrentMap<T: Sendable>(`
	`72`	`+ _ transform: @escaping @Sendable (Element) async throws -> T`
`73`	`73`	`) async rethrows -> [T] {`
`74`	`74`	`let tasks = map { element in`
`75`	`75`	`Task {`
`@@ -82,8 +82,8 @@ extension Sequence {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- func concurrentCompactMap<T>(`
`86`		`- _ transform: @escaping (Element) async throws -> T?`
	`85`	`+ func concurrentCompactMap<T: Sendable>(`
	`86`	`+ _ transform: @escaping @Sendable (Element) async throws -> T?`
`87`	`87`	`) async rethrows -> [T] {`
`88`	`88`	`let tasks = map { element in`
`89`	`89`	`Task {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.7`
	`1`	`+// swift-tools-version:6.0`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`