Bump xcode version, drop < swift 6.0

Author: younata

.github/workflows/ci-swiftpm.yml

@@ -11,24 +11,24 @@ on:
       - "*"
 
 jobs:
-  swiftpm_darwin_ventura:
+  swiftpm_darwin_sonoma:
     name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: ["14.3.1"]
+        xcode: ["15.3", "16.1"]
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
     steps:
       - uses: actions/checkout@v4
       - run: ./test swiftpm
 
-  swiftpm_darwin_sonoma:
+  swiftpm_darwin_sequoia:
     name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
-        xcode: ["15.3", "16.1"]
+        xcode: ["16.3"]
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
     steps:
@@ -41,10 +41,9 @@ jobs:
     strategy:
       matrix:
         container:
-          - swift:5.7
-          - swift:5.8
-          - swift:5.9
           - swift:6.0
+          - swift:6.1
+          - swift:6.2
           # - swiftlang/swift:nightly
       fail-fast: false
     container: ${{ matrix.container }}
@@ -61,7 +60,7 @@ jobs:
       - name: Install Swift
         uses: compnerd/gha-setup-swift@main
         with:
-          branch: swift-5.9-release
-          tag: 5.9-RELEASE
+          branch: swift-6.2-release
+          tag: 6.2-RELEASE
       - name: Test Windows
         run: swift test -Xswiftc -suppress-warnings

.github/workflows/ci-xcode.yml

@@ -11,12 +11,12 @@ on:
       - "*"
 
 jobs:
-  xcode_ventura:
+  xcode_sonoma:
     name: Xcode ${{ matrix.xcode }} (Xcode Project)
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: ["14.3.1"]
+        xcode: ["15.4", "16.1"]
       fail-fast: false
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -27,12 +27,12 @@ jobs:
       - run: ./test tvos
       - run: ./test watchos
 
-  xcode_sonoma:
+  xcode_sequoia:
     name: Xcode ${{ matrix.xcode }} (Xcode Project)
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
-        xcode: ["15.4", "16.1"]
+        xcode: ["16.3"]
       fail-fast: false
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -45,10 +45,10 @@ jobs:
 
   xcode_spm:
     name: Xcode ${{ matrix.xcode }} (Swift Package)
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.3"]
       fail-fast: false
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"

Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version:5.7
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
     name: "Nimble",
     platforms: [
-      .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)
+      .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1)
     ],
     products: [
         .library(
@@ -19,7 +19,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", .upToNextMajor(from: "2.1.0")),
+        .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", .upToNextMajor(from: "2.2.0")),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
     ],
     targets: {
@@ -32,14 +32,11 @@ let package = Package(
                 name: "Nimble",
                 dependencies: [
                     .product(name: "CwlPreconditionTesting", package: "CwlPreconditionTesting",
-                             condition: .when(platforms: [.macOS, .iOS, .macCatalyst])),
+                             condition: .when(platforms: [.macOS, .iOS, .macCatalyst, .visionOS])),
                     .product(name: "CwlPosixPreconditionTesting", package: "CwlPreconditionTesting",
                              condition: .when(platforms: [.tvOS, .watchOS]))
                 ],
-                exclude: ["Info.plist"],
-                resources: [
-                    .copy("PrivacyInfo.xcprivacy")
-                ]
+                exclude: ["Info.plist"]
             ),
             .target(
                 name: "NimbleSharedTestHelpers",

Sources/Nimble/Utils/AsyncAwait.swift

@@ -150,7 +150,7 @@ internal func performBlock(
 #endif
     #endif
 
-    return await withTaskGroup { taskGroup in
+    return await withTaskGroup(of: Void.self) { taskGroup in
         let blocker = BlockingTask(sourceLocation: sourceLocation)
         let tracker = ResultTracker<Void>()