From 7e2e15ab6ee04712139b05b50688f850c29f5e17 Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 7 Nov 2024 16:55:30 +0000 Subject: [PATCH 1/2] Remove '@_exported import GRPCCore' Motivation: We added '@_exported import GRPCCore' to transport modules to make it easier for users as it saves them from adding an import. On reflection we've our position on this has changed and the implicit dependency will likely make things less clear. Modifications: - Remove exported import of GRPCCore Result: More explicit dependencies --- Sources/GRPCNIOTransportHTTP2/Exports.swift | 1 - Sources/GRPCNIOTransportHTTP2Posix/Exports.swift | 1 - Sources/GRPCNIOTransportHTTP2TransportServices/Exports.swift | 1 - 3 files changed, 3 deletions(-) diff --git a/Sources/GRPCNIOTransportHTTP2/Exports.swift b/Sources/GRPCNIOTransportHTTP2/Exports.swift index 2af3c91..9fd00d0 100644 --- a/Sources/GRPCNIOTransportHTTP2/Exports.swift +++ b/Sources/GRPCNIOTransportHTTP2/Exports.swift @@ -14,7 +14,6 @@ * limitations under the License. */ -@_exported import GRPCCore @_exported import GRPCNIOTransportCore @_exported import GRPCNIOTransportHTTP2Posix @_exported import GRPCNIOTransportHTTP2TransportServices diff --git a/Sources/GRPCNIOTransportHTTP2Posix/Exports.swift b/Sources/GRPCNIOTransportHTTP2Posix/Exports.swift index b363c39..1d6ed2b 100644 --- a/Sources/GRPCNIOTransportHTTP2Posix/Exports.swift +++ b/Sources/GRPCNIOTransportHTTP2Posix/Exports.swift @@ -14,5 +14,4 @@ * limitations under the License. */ -@_exported import GRPCCore @_exported import GRPCNIOTransportCore diff --git a/Sources/GRPCNIOTransportHTTP2TransportServices/Exports.swift b/Sources/GRPCNIOTransportHTTP2TransportServices/Exports.swift index b363c39..1d6ed2b 100644 --- a/Sources/GRPCNIOTransportHTTP2TransportServices/Exports.swift +++ b/Sources/GRPCNIOTransportHTTP2TransportServices/Exports.swift @@ -14,5 +14,4 @@ * limitations under the License. */ -@_exported import GRPCCore @_exported import GRPCNIOTransportCore From 30fde2b550804ee0e0cd83da463a6464cb4217aa Mon Sep 17 00:00:00 2001 From: George Barnett Date: Fri, 8 Nov 2024 11:09:40 +0000 Subject: [PATCH 2/2] add missing import in tests --- Package.swift | 1 + .../HTTP2TransportTLSEnabledTests.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/Package.swift b/Package.swift index f4dd1e7..aa5aa60 100644 --- a/Package.swift +++ b/Package.swift @@ -138,6 +138,7 @@ let targets: [Target] = [ name: "GRPCNIOTransportHTTP2Tests", dependencies: [ .target(name: "GRPCNIOTransportHTTP2"), + .product(name: "GRPCCore", package: "grpc-swift"), .product(name: "X509", package: "swift-certificates"), .product(name: "NIOSSL", package: "swift-nio-ssl"), ], diff --git a/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTLSEnabledTests.swift b/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTLSEnabledTests.swift index 7992826..3945751 100644 --- a/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTLSEnabledTests.swift +++ b/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTLSEnabledTests.swift @@ -16,6 +16,7 @@ import Crypto import Foundation +import GRPCCore import GRPCNIOTransportHTTP2Posix import NIOSSL import SwiftASN1