Bump to Swift 6.1 (#8)

Author: davdroman

.editorconfig

@@ -0,0 +1,24 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+max_line_length = 120
+
+[*.swift]
+indent_style = tab
+
+[*.md]
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = tab
+
+[*.yml]
+indent_style = space
+indent_size = 4

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
   apple:
     if: github.event_name != 'pull_request' || !contains(github.event.pull_request.title, '[skip ci]')
     name: ${{ matrix.platform }} (Swift ${{ matrix.swift }})
-    runs-on: macos-15
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
@@ -43,12 +43,16 @@ jobs:
           - mac-catalyst
           - macOS
           - tvOS
-          - watchOS
           - visionOS
+          - watchOS
         swift:
-          - "6.0"
           - "6.1"
-          - "6.2"
+          - "6.3"
+        include:
+          - swift: "6.1"
+            runner: macos-15
+          - swift: "6.3"
+            runner: macos-26
     steps:
       - name: Git Checkout
         uses: actions/checkout@v5
@@ -61,10 +65,10 @@ jobs:
           verbosity: xcbeautify
 
       - name: Disable SwiftSyntax Prebuilts
+        # TODO: Drop or update Swift version constraint as prebuilts become available
+        if: ${{ matrix.swift == '6.3' }}
         run: |
           defaults write com.apple.dt.Xcode IDEPackageEnablePrebuilts -bool NO
-
-          # nuke cache to ensure it takes effect
           rm -rf ~/Library/Developer/Xcode/DerivedData
           rm -rf ~/Library/Developer/Xcode/SourcePackages
           rm -rf ~/Library/Caches/org.swift.swiftpm
@@ -87,7 +91,6 @@ jobs:
           platform: ${{ matrix.platform }}
           swift: ~${{ matrix.swift }}
           action: test
-          scheme: ObjCRuntimeTools
           verbosity: xcbeautify
 
   check-swift-syntax-compatibility:
@@ -101,5 +104,5 @@ jobs:
         uses: davdroman/swift-macro-compatibility-check@from-version
         with:
           run-tests: false
-          from-version: "600.0.0"
+          from-version: "601.0.0"
           major-versions-only: true

.swift-version

@@ -1 +1 @@
-6.0
+6.1

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.1
 
 import CompilerPluginSupport
 import PackageDescription
@@ -22,9 +22,9 @@ let package = Package(
 			dependencies: [
 				"Association",
 				"Swizzling",
-			]
+			],
 		),
-	]
+	],
 )
 
 // MARK: Association
@@ -40,7 +40,7 @@ package.targets += [
 		dependencies: [
 			.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
 			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-		]
+		],
 	),
 
 	.testTarget(
@@ -49,10 +49,7 @@ package.targets += [
 			"Association",
 			"AssociationMacro",
 			.product(name: "MacroTesting", package: "swift-macro-testing"),
-			// For some reason, with Swift Syntax prebuilts enabled, we need to depend on SwiftCompilerPlugin here to work around error:
-			// Compilation search paths unable to resolve module dependency: 'SwiftCompilerPlugin'
-			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-		]
+		],
 	),
 ]
 
@@ -69,7 +66,7 @@ package.targets += [
 		dependencies: [
 			.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
 			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-		]
+		],
 	),
 
 	.testTarget(
@@ -78,10 +75,7 @@ package.targets += [
 			"Swizzling",
 			"SwizzlingMacro",
 			.product(name: "MacroTesting", package: "swift-macro-testing"),
-			// For some reason, with Swift Syntax prebuilts enabled, we need to depend on SwiftCompilerPlugin here to work around error:
-			// Compilation search paths unable to resolve module dependency: 'SwiftCompilerPlugin'
-			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-		]
+		],
 	),
 ]
 
@@ -95,5 +89,6 @@ for target in package.targets {
 	target.swiftSettings? += [
 		.enableUpcomingFeature("ExistentialAny"),
 		.enableUpcomingFeature("InternalImportsByDefault"),
+		.enableUpcomingFeature("MemberImportVisibility"),
 	]
 }

Package.swift

@@ -1,16 +1,16 @@
 @attached(peer, names: arbitrary)
 @attached(accessor)
 public macro Associated(
-	_ policy: Policy
+	_ policy: Policy,
 ) = #externalMacro(
 	module: "AssociationMacro",
-	type: "AssociatedMacro"
+	type: "AssociatedMacro",
 )
 
 @attached(accessor)
 public macro _Associated(
-	_ policy: Policy
+	_ policy: Policy,
 ) = #externalMacro(
 	module: "AssociationMacro",
-	type: "AssociatedMacro"
+	type: "AssociatedMacro",
 )