feat: Swift 6 and Swift Testing (#61)

* chore: project updates

* chore: Swift 6 & Swift Testing

* chore: adds Swift 6 to test matrix

* chore: narrow down testing

* chore: add macos latest

* chore: ci

* chore: Cache

---------

Co-authored-by: danthorpe <[email protected]>

Author: danthorpe

.github/workflows/main.yml

@@ -13,25 +13,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  analysis:
-    name: CodeQL
-    if: github.event_name != 'workflow_dispatch'
-    uses: danthorpe/ci/.github/workflows/static-analysis.yml@main
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    with:
-      matrix: >
-        {
-          "include": [
-            {
-              "os": "ubuntu-latest",
-              "swift": "latest",
-              "xcode": "latest"
-            }
-          ]
-        }
 
   swift-package-test:
     name: Test Swift Package
@@ -42,26 +23,21 @@ jobs:
         {
           "include": [
             {
-              "os": "macos-14",
-              "swift": "5.9",
-              "xcode": "15.1"
-            },
-            {
-              "os": "macos-14",
-              "swift": "5.10",
-              "xcode": "15.3"
+              "os": "macos-latest",
+              "xcode": "latest",
+              "swift": "6.0"
             },
             {
               "os": "ubuntu-latest",
-              "swift": "5.10"
+              "swift": "6.0"
             }
           ]
         }
 
   docs:
     name: Docs
     if: github.event_name == 'push'
-    needs: [analysis, swift-package-test]
+    needs: [swift-package-test]
     uses: danthorpe/ci/.github/workflows/docs.yml@main
     with:
       os: 'macos-14'

Package.resolved

@@ -1,5 +1,5 @@
-// swift-tools-version: 5.8
-import PackageDescription
+// swift-tools-version: 6.0
+@preconcurrency import PackageDescription
 
 var package = Package(name: "swift-utilities")
 
@@ -46,7 +46,8 @@ AssertionExtras
     ]
     $0.with = [
       .customDump,
-      .xcTestDynamicOverlay,
+      .issueReporting,
+      .issueReportingTestSupport,
     ]
   }
 #if !os(Linux)
@@ -58,8 +59,10 @@ Cache
     ]
     $0.with = [
       .asyncAlgorithms,
+      .concurrencyExtras,
       .deque,
       .dependencies,
+      .dependenciesMacros,
       .orderedCollections,
     ]
   }
@@ -76,7 +79,9 @@ FileManagerClient
     $0.createProduct = .library
     $0.createUnitTests = false
     $0.with = [
-      .xcTestDynamicOverlay
+      .dependencies,
+      .dependenciesMacros,
+      .issueReporting,
     ]
   }
 Protected
@@ -90,7 +95,7 @@ Reachability
     $0.with = [
       .asyncAlgorithms,
       .dependencies,
-      .xcTestDynamicOverlay,
+      .issueReporting,
     ]
   }
 ShortID
@@ -113,23 +118,30 @@ ShortID
 package.dependencies = [
   .package(url: "https://github.com/apple/swift-async-algorithms", from: "1.0.0"),
   .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.2"),
-  .package(url: "https://github.com/apple/swift-collections", from: "1.0.2"),
+  .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
   .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
+  .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.3.0"),
   .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"),
-  .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.2.0"),
-  .package(url: "http://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.1.2"),
+  .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.7.0"),
+  .package(url: "http://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
 ]
 
 extension Target.Dependency {
   static let asyncAlgorithms: Self = .product(
     name: "AsyncAlgorithms", package: "swift-async-algorithms"
   )
+  static let concurrencyExtras: Self = .product(
+    name: "ConcurrencyExtras", package: "swift-concurrency-extras"
+  )
   static let customDump: Self = .product(
     name: "CustomDump", package: "swift-custom-dump"
   )
   static let dependencies: Self = .product(
     name: "Dependencies", package: "swift-dependencies"
   )
+  static let dependenciesMacros: Self = .product(
+    name: "DependenciesMacros", package: "swift-dependencies"
+  )
   static let deque: Target.Dependency = .product(
     name: "DequeModule", package: "swift-collections"
   )
@@ -139,8 +151,11 @@ extension Target.Dependency {
   static let tagged: Self = .product(
     name: "Tagged", package: "swift-tagged"
   )
-  static let xcTestDynamicOverlay: Self = .product(
-    name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"
+  static let issueReporting: Self = .product(
+    name: "IssueReporting", package: "xctest-dynamic-overlay"
+  )
+  static let issueReportingTestSupport: Self = .product(
+    name: "IssueReportingTestSupport", package: "xctest-dynamic-overlay"
   )
 }
 
@@ -347,7 +362,7 @@ infix operator <>
 extension String {
 
   /// Adds the string as a module to the package, using the provided module
-  static func <+ (lhs: String, rhs: Module) {
+  @MainActor static func <+ (lhs: String, rhs: Module) {
     var module = rhs
     module.name = lhs
     package.add(module: module)
@@ -358,7 +373,7 @@ infix operator <+
 extension String {
 
   /// Adds the string as a module to the package, allowing for inline customization
-  static func <> (lhs: String, rhs: Module.Builder) {
+  @MainActor static func <> (lhs: String, rhs: Module.Builder) {
     var module = Module(name: lhs)
     rhs(&module)
     package.add(module: module)