annotate new functions + follow Swift API Design Guidelines

Author: MathieuTricoire

Package.swift

@@ -50,7 +50,7 @@ let dependencies: [Package.Dependency] = [
 
 // This adds some build settings which allow us to map "@available(gRPCSwift 2.x, *)" to
 // the appropriate OS platforms.
-let nextMinorVersion = 1
+let nextMinorVersion = 2
 let availabilitySettings: [SwiftSetting] = (0 ... nextMinorVersion).map { minor in
   let name = "gRPCSwift"
   let version = "2.\(minor)"

Sources/GRPCCore/Call/ConditionalInterceptor.swift

@@ -30,59 +30,61 @@
 public struct ConditionalInterceptor<Interceptor: Sendable>: Sendable {
   public struct Subject: Sendable {
 
-    private let predicate: @Sendable (MethodDescriptor) -> Bool
+    private let predicate: @Sendable (_ descriptor: MethodDescriptor) -> Bool
 
     /// An operation subject specifying an interceptor that applies to all RPCs across all services will be registered with this client.
     public static var all: Self {
-      Self(predicate: { _ in true })
+      Self { _ in true }
     }
 
     /// An operation subject specifying an interceptor that will be applied only to RPCs directed to the specified services.
     ///
     /// - Parameters:
     ///   - services: The list of service descriptors for which this interceptor should intercept RPCs.
     public static func services(_ services: Set<ServiceDescriptor>) -> Self {
-      Self(predicate: { descriptor in
+      Self { descriptor in
         services.contains(descriptor.service)
-      })
+      }
     }
 
     /// An operation subject specifying an interceptor that will be applied only to RPCs directed to the specified service methods.
     ///
     /// - Parameters:
     ///   - methods: The list of method descriptors for which this interceptor should intercept RPCs.
     public static func methods(_ methods: Set<MethodDescriptor>) -> Self {
-      Self(predicate: { descriptor in
+      Self { descriptor in
         methods.contains(descriptor)
-      })
+      }
     }
 
     /// An operation subject specifying an interceptor that will be applied only to RPCs directed to the specified services or service methods.
     ///
     /// - Parameters:
     ///   - services: The list of service descriptors for which this interceptor should intercept RPCs.
     ///   - methods: The list of method descriptors for which this interceptor should intercept RPCs.
+    @available(gRPCSwift 2.2, *)
     public static func only(
       services: Set<ServiceDescriptor>,
       methods: Set<MethodDescriptor>
     ) -> Self {
-      Self(predicate: { descriptor in
+      Self { descriptor in
         services.contains(descriptor.service) || methods.contains(descriptor)
-      })
+      }
     }
 
     /// An operation subject specifying an interceptor that will be applied to all RPCs across all services for this client excluding the specified services or service methods.
     ///
     /// - Parameters:
     ///   - services: The list of service descriptors for which this interceptor should **not** intercept RPCs.
     ///   - methods: The list of method descriptors for which this interceptor should **not** intercept RPCs.
+    @available(gRPCSwift 2.2, *)
     public static func allExcluding(
       services: Set<ServiceDescriptor>,
       methods: Set<MethodDescriptor>
     ) -> Self {
-      Self(predicate: { descriptor in
+      Self { descriptor in
         !(services.contains(descriptor.service) || methods.contains(descriptor))
-      })
+      }
     }
 
     /// An operation subject specifying an interceptor that will be applied to RPCs whose ``MethodDescriptor`` satisfies a `predicate`.
@@ -96,8 +98,9 @@ public struct ConditionalInterceptor<Interceptor: Sendable>: Sendable {
     ///
     /// - Parameters:
     ///   - predicate: A `@Sendable` closure evaluated per RPC. Return `true` to intercept.
+    @available(gRPCSwift 2.2, *)
     public static func allMatching(
-      _ predicate: @Sendable @escaping (MethodDescriptor) -> Bool
+      _ predicate: @Sendable @escaping (_ descriptor: MethodDescriptor) -> Bool
     ) -> Self {
       Self(predicate: predicate)
     }