Merge pull request #211 from cashapp/bradfol/swift6

Improve Swift 6 toolchain support

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           swift-version: "5.10"
       - name: Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Create Release
         run: |
           set -euo pipefail

.github/workflows/swift.yml

@@ -10,16 +10,32 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build-knit:
+  build-knit-swift-5:
 
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
     - uses: swift-actions/[email protected]
       with:
         swift-version: "5.10"
     - name: Build Knit
       run: swift build -v
     - name: Run Knit tests
       run: swift test -v
+
+# Enable below when issue is resolved: https://github.com/swift-actions/setup-swift/issues/683
+
+#  build-knit-swift-6:
+#
+#    runs-on: macos-latest
+#
+#    steps:
+#    - uses: actions/[email protected]
+#    - uses: swift-actions/[email protected]
+#      with:
+#        swift-version: "6.0"
+#    - name: Build Knit
+#      run: swift build -v
+#    - name: Run Knit tests
+#      run: swift test -v

Package.swift

@@ -66,5 +66,9 @@ let package = Package(
                 "KnitCodeGen",
             ]
         ),
+    ],
+    swiftLanguageVersions: [
+        // When this SPM package is imported by a Swift 6 toolchain it should still be used in the v5 language mode
+        .v5,
     ]
 )

Sources/KnitCodeGen/AssemblyParsing.swift

@@ -3,8 +3,8 @@
 //
 
 import Foundation
-import SwiftSyntax
-import SwiftParser
+@preconcurrency import SwiftSyntax
+@preconcurrency import SwiftParser
 
 class AssemblyFileVisitor: SyntaxVisitor, IfConfigVisitor {
 

Sources/KnitCodeGen/Configuration.swift

@@ -5,14 +5,14 @@
 import Foundation
 import SwiftSyntax
 
-public struct Configuration: Encodable {
+public struct Configuration: Encodable, Sendable {
 
     /// Name of the module for this configuration.
     public var assemblyName: String
     public let moduleName: String
     public var directives: KnitDirectives
 
-    public enum AssemblyType: String, Encodable {
+    public enum AssemblyType: String, Encodable, Sendable {
         /// `Swinject.Assembly`
         case moduleAssembly = "ModuleAssembly"
         case autoInitAssembly = "AutoInitModuleAssembly"

Sources/KnitCodeGen/FunctionCallRegistrationParsing.swift

@@ -3,7 +3,7 @@
 //
 
 import Foundation
-import SwiftSyntax
+@preconcurrency import SwiftSyntax
 
 struct CalledMethod {
 

Sources/KnitCodeGen/KnitDirectives.swift

@@ -5,7 +5,7 @@
 import Foundation
 import SwiftSyntax
 
-public struct KnitDirectives: Codable, Equatable {
+public struct KnitDirectives: Codable, Equatable, Sendable {
     var accessLevel: AccessLevel?
     var getterConfig: Set<GetterConfig>
     var moduleName: String?
@@ -131,16 +131,16 @@ extension KnitDirectives {
     }
 }
 
-public enum GetterConfig: Codable, Equatable, Hashable {
+public enum GetterConfig: Codable, Equatable, Hashable, Sendable {
     /// Only the `callAsFunction()` accessor is generated.
     case callAsFunction
     /// Only the identified getter is generated.
     case identifiedGetter(_ name: String?)
 
     /// Centralized control of the default behavior.
-    public static var `default`: Set<GetterConfig> = [.identifiedGetter(nil)]
+    public static let `default`: Set<GetterConfig> = [.identifiedGetter(nil)]
 
-    public static var both: Set<GetterConfig> = [.callAsFunction, .identifiedGetter(nil)]
+    public static let both: Set<GetterConfig> = [.callAsFunction, .identifiedGetter(nil)]
 
     public var isNamed: Bool {
         switch self {
@@ -150,12 +150,12 @@ public enum GetterConfig: Codable, Equatable, Hashable {
     }
 }
 
-public enum AccessLevel: String, CaseIterable, Codable {
+public enum AccessLevel: String, CaseIterable, Codable, Sendable {
     case `public`
     case `internal`
     case hidden
     case ignore
 
     /// Centralized control of the default behavior.
-    public static var `default`: AccessLevel = .internal
+    public static let `default`: AccessLevel = .internal
 }

Sources/KnitCodeGen/ModuleImport.swift

@@ -3,9 +3,9 @@
 //
 
 import Foundation
-import SwiftSyntax
+@preconcurrency import SwiftSyntax
 
-public struct ModuleImport {
+public struct ModuleImport: Sendable {
     let decl: ImportDeclSyntax
     let ifConfigCondition: ExprSyntax?
     let name: String

Sources/KnitCodeGen/Registration.swift

@@ -2,9 +2,9 @@
 // Copyright © Block, Inc. All rights reserved.
 //
 
-import SwiftSyntax
+@preconcurrency import SwiftSyntax
 
-public struct Registration: Equatable, Codable {
+public struct Registration: Equatable, Codable, Sendable {
 
     public var service: String
 
@@ -63,7 +63,7 @@ public struct Registration: Equatable, Codable {
 
 extension Registration {
 
-    public struct Argument: Equatable, Codable {
+    public struct Argument: Equatable, Codable, Sendable {
 
         let identifier: Identifier
         let type: String
@@ -77,7 +77,7 @@ extension Registration {
             self.type = type
         }
 
-        public enum Identifier: Codable, Equatable {
+        public enum Identifier: Codable, Equatable, Sendable {
             /// Used for arguments defined in `.register` registrations.
             case fixed(String)
 
@@ -87,7 +87,7 @@ extension Registration {
 
     }
 
-    public enum FunctionName: String, Codable {
+    public enum FunctionName: String, Codable, Sendable {
         case register
         case autoregister
         case registerAbstract

Sources/KnitCodeGen/RegistrationIntoCollection.swift

@@ -4,7 +4,7 @@
 
 /// Represents a single concrete factory registered into a collection
 /// A separate instance will be created for each call to `{auto}registerIntoCollection`
-public struct RegistrationIntoCollection: Equatable {
+public struct RegistrationIntoCollection: Equatable, Sendable {
 
     public var service: String