grpc · glbrntt · Oct 4, 2024 · Oct 4, 2024
diff --git a/Package.swift b/Package.swift
@@ -138,6 +138,13 @@ let targets: [Target] = [
 
 let package = Package(
   name: "grpc-swift-nio-transport",
+  platforms: [
+    .macOS(.v15),
+    .iOS(.v18),
+    .tvOS(.v18),
+    .watchOS(.v11),
+    .visionOS(.v2),
+  ],
   products: products,
   dependencies: dependencies,
   targets: targets

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/Connection.swift b/Sources/GRPCNIOTransportCore/Client/Connection/Connection.swift
@@ -43,7 +43,6 @@ private import Synchronization
 ///   }
 /// }
 /// ```
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 package final class Connection: Sendable {
   /// Events which can happen over the lifetime of the connection.
   package enum Event: Sendable {
@@ -350,7 +349,6 @@ package final class Connection: Sendable {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension Connection {
   package struct Stream {
     package typealias Inbound = NIOAsyncChannelInboundStream<RPCResponsePart>
@@ -412,7 +410,6 @@ extension Connection {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension Connection {
   private enum State: Sendable {
     /// The connection is idle or connecting.

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/ConnectionBackoff.swift b/Sources/GRPCNIOTransportCore/Client/Connection/ConnectionBackoff.swift
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
 package struct ConnectionBackoff {
   package var initial: Duration
   package var max: Duration

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/ConnectionFactory.swift b/Sources/GRPCNIOTransportCore/Client/Connection/ConnectionFactory.swift
@@ -18,12 +18,10 @@ package import NIOCore
 package import NIOHTTP2
 internal import NIOPosix
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 package protocol HTTP2Connector: Sendable {
   func establishConnection(to address: SocketAddress) async throws -> HTTP2Connection
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 package struct HTTP2Connection: Sendable {
   /// The underlying TCP connection wrapped up for use with gRPC.
   var channel: NIOAsyncChannel<ClientConnectionEvent, Void>

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/GRPCChannel.swift b/Sources/GRPCNIOTransportCore/Client/Connection/GRPCChannel.swift
@@ -18,7 +18,6 @@ private import DequeModule
 package import GRPCCore
 private import Synchronization
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 package final class GRPCChannel: ClientTransport {
   private enum Input: Sendable {
     /// Close the channel, if possible.
@@ -225,7 +224,6 @@ package final class GRPCChannel: ClientTransport {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension GRPCChannel {
   package struct Config: Sendable {
     /// Configuration for HTTP/2 connections.
@@ -254,7 +252,6 @@ extension GRPCChannel {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension GRPCChannel {
   enum MakeStreamResult {
     /// A stream was created, use it.
@@ -347,7 +344,6 @@ extension GRPCChannel {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension GRPCChannel {
   private func handleClose(in group: inout DiscardingTaskGroup) {
     switch self.state.withLock({ $0.close() }) {
@@ -574,7 +570,6 @@ extension GRPCChannel {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension GRPCChannel {
   struct StateMachine {
     enum State {
@@ -649,7 +644,6 @@ extension GRPCChannel {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension GRPCChannel.StateMachine {
   mutating func start() {
     precondition(!self.running, "channel must only be started once")

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/LoadBalancer.swift b/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/LoadBalancer.swift
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 package enum LoadBalancer: Sendable {
   case roundRobin(RoundRobinLoadBalancer)
   case pickFirst(PickFirstLoadBalancer)
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension LoadBalancer {
   package init(_ loadBalancer: RoundRobinLoadBalancer) {
     self = .roundRobin(loadBalancer)

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/PickFirstLoadBalancer.swift b/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/PickFirstLoadBalancer.swift
@@ -56,7 +56,6 @@ private import Synchronization
 ///   }
 /// }
 /// ```
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 package final class PickFirstLoadBalancer: Sendable {
   enum Input: Sendable, Hashable {
     /// Update the addresses used by the load balancer to the following endpoints.
@@ -165,7 +164,6 @@ package final class PickFirstLoadBalancer: Sendable {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension PickFirstLoadBalancer {
   private func handleUpdateEndpoint(_ endpoint: Endpoint, in group: inout DiscardingTaskGroup) {
     if endpoint.addresses.isEmpty { return }
@@ -266,7 +264,6 @@ extension PickFirstLoadBalancer {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension PickFirstLoadBalancer {
   enum State: Sendable {
     case active(Active)
@@ -279,7 +276,6 @@ extension PickFirstLoadBalancer {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension PickFirstLoadBalancer.State {
   struct Active: Sendable {
     var endpoint: Endpoint?
@@ -308,7 +304,6 @@ extension PickFirstLoadBalancer.State {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension PickFirstLoadBalancer.State.Active {
   mutating func updateEndpoint(
     _ endpoint: Endpoint,
@@ -471,7 +466,6 @@ extension PickFirstLoadBalancer.State.Active {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension PickFirstLoadBalancer.State.Closing {
   mutating func updateSubchannelConnectivityState(
     _ connectivityState: ConnectivityState,
@@ -512,7 +506,6 @@ extension PickFirstLoadBalancer.State.Closing {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension PickFirstLoadBalancer.State {
   enum OnUpdateEndpoint {
     case connect(Subchannel, close: Subchannel?)

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/RoundRobinLoadBalancer.swift b/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/RoundRobinLoadBalancer.swift
@@ -58,7 +58,6 @@ private import NIOConcurrencyHelpers
 ///   }
 /// }
 /// ```
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 package final class RoundRobinLoadBalancer: Sendable {
   enum Input: Sendable, Hashable {
     /// Update the addresses used by the load balancer to the following endpoints.
@@ -198,7 +197,6 @@ package final class RoundRobinLoadBalancer: Sendable {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension RoundRobinLoadBalancer {
   /// Handles an update in endpoints.
   ///
@@ -340,7 +338,6 @@ extension RoundRobinLoadBalancer {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension RoundRobinLoadBalancer {
   private enum State {
     case active(Active)

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/Subchannel.swift b/Sources/GRPCNIOTransportCore/Client/Connection/LoadBalancers/Subchannel.swift
@@ -43,7 +43,6 @@ private import Synchronization
 ///   }
 /// }
 /// ```
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 package final class Subchannel: Sendable {
   package enum Event: Sendable, Hashable {
     /// The connection received a GOAWAY and will close soon. No new streams
@@ -117,7 +116,6 @@ package final class Subchannel: Sendable {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension Subchannel {
   /// A stream of events which can happen to the subchannel.
   package var events: AsyncStream<Event> {
@@ -190,7 +188,6 @@ extension Subchannel {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension Subchannel {
   private func handleConnectInput(in group: inout DiscardingTaskGroup) {
     let connection = self.state.withLock { state in
@@ -368,7 +365,6 @@ extension Subchannel {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension Subchannel {
   ///            ┌───────────────┐
   ///   ┌───────▶│ NOT CONNECTED │───────────shutDown─────────────┐

diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/RequestQueue.swift b/Sources/GRPCNIOTransportCore/Client/Connection/RequestQueue.swift
@@ -16,7 +16,6 @@
 
 internal import DequeModule
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 struct RequestQueue {
   typealias Continuation = CheckedContinuation<LoadBalancer, any Error>
 

diff --git a/Sources/GRPCNIOTransportCore/Client/GRPCClientStreamHandler.swift b/Sources/GRPCNIOTransportCore/Client/GRPCClientStreamHandler.swift
@@ -18,7 +18,6 @@ internal import GRPCCore
 internal import NIOCore
 internal import NIOHTTP2
 
-@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
 final class GRPCClientStreamHandler: ChannelDuplexHandler {
   typealias InboundIn = HTTP2Frame.FramePayload
   typealias InboundOut = RPCResponsePart
@@ -56,7 +55,6 @@ final class GRPCClientStreamHandler: ChannelDuplexHandler {
 
 // - MARK: ChannelInboundHandler
 
-@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
 extension GRPCClientStreamHandler {
   func channelRead(context: ChannelHandlerContext, data: NIOAny) {
     self.isReading = true
@@ -176,7 +174,6 @@ extension GRPCClientStreamHandler {
 
 // - MARK: ChannelOutboundHandler
 
-@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
 extension GRPCClientStreamHandler {
   func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
     switch self.unwrapOutboundIn(data) {

diff --git a/Sources/GRPCNIOTransportCore/Client/HTTP2ClientTransport.swift b/Sources/GRPCNIOTransportCore/Client/HTTP2ClientTransport.swift
@@ -50,7 +50,6 @@ extension HTTP2ClientTransport.Config {
     }
   }
 
-  @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
   public struct Keepalive: Sendable, Hashable {
     /// The amount of time to wait after reading data before sending a keepalive ping.
     ///
@@ -72,7 +71,6 @@ extension HTTP2ClientTransport.Config {
     }
   }
 
-  @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
   public struct Connection: Sendable, Hashable {
     /// The maximum amount of time a connection may be idle before it's closed.
     ///
@@ -102,7 +100,6 @@ extension HTTP2ClientTransport.Config {
     }
   }
 
-  @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
   public struct Backoff: Sendable, Hashable {
     /// The initial duration to wait before reattempting to establish a connection.
     public var initial: Duration

diff --git a/Sources/GRPCNIOTransportCore/Client/Resolver/DNSResolver.swift b/Sources/GRPCNIOTransportCore/Client/Resolver/DNSResolver.swift
@@ -26,7 +26,6 @@ private import Musl
 #error("The GRPCNIOTransportCore module was unable to identify your C library.")
 #endif
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 /// An asynchronous non-blocking DNS resolver built on top of the libc `getaddrinfo` function.
 package enum DNSResolver {
   private static let dispatchQueue = DispatchQueue(
@@ -134,7 +133,6 @@ package enum DNSResolver {
   }
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension DNSResolver {
   /// `Error` that may be thrown based on the error code returned by `getaddrinfo`.
   package struct GetAddrInfoError: Error, Hashable, CustomStringConvertible {
@@ -150,7 +148,6 @@ extension DNSResolver {
   }
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension DNSResolver {
   /// `Error` that may be thrown based on the system error encountered by `inet_ntop`.
   package struct InetNetworkToPresentationError: Error, Hashable {
@@ -162,7 +159,6 @@ extension DNSResolver {
   }
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension SocketAddress.IPv4 {
   fileprivate init(_ address: sockaddr_in) throws {
     let presentationAddress = try withUnsafePointer(to: address.sin_addr) { addressPtr in
@@ -177,7 +173,6 @@ extension SocketAddress.IPv4 {
   }
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension SocketAddress.IPv6 {
   fileprivate init(_ address: sockaddr_in6) throws {
     let presentationAddress = try withUnsafePointer(to: address.sin6_addr) { addressPtr in

diff --git a/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+DNS.swift b/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+DNS.swift
@@ -50,7 +50,6 @@ extension ResolvableTarget where Self == ResolvableTargets.DNS {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers {
   /// A ``NameResolverFactory`` for ``ResolvableTargets/DNS`` targets.
   public struct DNS: NameResolverFactory {
@@ -66,7 +65,6 @@ extension NameResolvers {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers.DNS {
   struct Resolver: Sendable {
     var target: ResolvableTargets.DNS
@@ -97,7 +95,6 @@ extension NameResolvers.DNS {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers.DNS.Resolver: AsyncSequence {
   typealias Element = NameResolutionResult
 

diff --git a/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+IPv4.swift b/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+IPv4.swift
@@ -54,7 +54,6 @@ extension ResolvableTarget where Self == ResolvableTargets.IPv4 {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers {
   /// A ``NameResolverFactory`` for ``ResolvableTargets/IPv4`` targets.
   ///

diff --git a/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+IPv6.swift b/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+IPv6.swift
@@ -54,7 +54,6 @@ extension ResolvableTarget where Self == ResolvableTargets.IPv6 {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers {
   /// A ``NameResolverFactory`` for ``ResolvableTargets/IPv6`` targets.
   ///

diff --git a/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+UDS.swift b/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+UDS.swift
@@ -40,7 +40,6 @@ extension ResolvableTarget where Self == ResolvableTargets.UnixDomainSocket {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers {
   /// A ``NameResolverFactory`` for ``ResolvableTargets/UnixDomainSocket`` targets.
   ///

diff --git a/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+VSOCK.swift b/Sources/GRPCNIOTransportCore/Client/Resolver/NameResolver+VSOCK.swift
@@ -44,7 +44,6 @@ extension ResolvableTarget where Self == ResolvableTargets.VirtualSocket {
   }
 }
 
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
 extension NameResolvers {
   /// A ``NameResolverFactory`` for ``ResolvableTargets/VirtualSocket`` targets.
   ///