Merge pull request #1428 from glbrntt/gb-merge-async

Merge the async branch into main

Author: glbrntt

.github/workflows/ci.yaml

@@ -3,7 +3,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches: [main, 1.7.1-async-await]
 jobs:
   preflight:
     name: License Header and Formatting Checks
@@ -25,7 +25,8 @@ jobs:
       matrix:
         include:
           - image: swift:5.6-focal
-            swift-test-flags: "--sanitize=thread"
+            # No TSAN because of: https://github.com/apple/swift/issues/59068
+            # swift-test-flags: "--sanitize=thread"
           - image: swift:5.5-focal
             swift-test-flags: "--sanitize=thread"
           - image: swift:5.4-focal
@@ -109,8 +110,6 @@ jobs:
         GRPC_NO_NIO_SSL: 1
       timeout-minutes: 20
     - name: Test without NIOSSL
-      # Skip tests on 5.6: https://bugs.swift.org/browse/SR-15955
-      if: ${{ matrix.image != 'swift:5.6-focal' }}
       run: swift test
       env:
         GRPC_NO_NIO_SSL: 1

Package.swift

@@ -27,6 +27,14 @@ let cgrpcZlibTargetName = cgrpcZlibProductName
 
 let includeNIOSSL = ProcessInfo.processInfo.environment["GRPC_NO_NIO_SSL"] == nil
 
+#if swift(>=5.6)
+// swift-argument-parser raised its minimum Swift version in 1.1.0 but
+// also accidentally broke API. This was fixed in "1.1.1".
+let argumentParserMinimumVersion: Version = "1.1.1"
+#else
+let argumentParserMinimumVersion: Version = "1.0.0"
+#endif
+
 // MARK: - Package Dependencies
 
 let packageDependencies: [Package.Dependency] = [
@@ -49,15 +57,15 @@ let packageDependencies: [Package.Dependency] = [
   .package(
     name: "SwiftProtobuf",
     url: "https://github.com/apple/swift-protobuf.git",
-    from: "1.9.0"
+    from: "1.19.0"
   ),
   .package(
     url: "https://github.com/apple/swift-log.git",
     from: "1.4.0"
   ),
   .package(
     url: "https://github.com/apple/swift-argument-parser.git",
-    from: "1.0.0"
+    from: argumentParserMinimumVersion
   ),
 ].appending(
   .package(
@@ -392,7 +400,6 @@ extension Target {
       .nioCore,
       .nioPosix,
       .nioExtras,
-      .logging,
       .argumentParser,
     ],
     path: "Sources/Examples/PacketCapture",

Performance/QPSBenchmark/Package.swift

@@ -34,7 +34,7 @@ let package = Package(
     .package(
       name: "SwiftProtobuf",
       url: "https://github.com/apple/swift-protobuf.git",
-      from: "1.9.0"
+      from: "1.19.0"
     ),
   ],
   targets: [