From 848695843d328dfd53ce3bee57b8f3079b9aa114 Mon Sep 17 00:00:00 2001 From: Gus Cairo Date: Thu, 11 Jan 2024 13:28:53 +0000 Subject: [PATCH 1/3] Add GRPCHTTP2Core module --- Package.swift | 21 ++++++++++++++++++- Sources/GRPCHTTP2Core/README.md | 1 + .../GRPCHTTP2CoreTests.swift | 17 +++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Sources/GRPCHTTP2Core/README.md create mode 100644 Tests/GRPCHTTP2CoreTests/GRPCHTTP2CoreTests.swift diff --git a/Package.swift b/Package.swift index 27316039d..d3695ed4e 100644 --- a/Package.swift +++ b/Package.swift @@ -134,6 +134,7 @@ extension Target.Dependency { static let grpcCore: Self = .target(name: "GRPCCore") static let grpcInProcessTransport: Self = .target(name: "GRPCInProcessTransport") + static let grpcHTTP2Core: Self = .target(name: "GRPCHTTP2Core") } // MARK: - Targets @@ -177,6 +178,15 @@ extension Target { .grpcCore ] ) + + static let grpcHTTP2Core: Target = .target( + name: "GRPCHTTP2Core", + dependencies: [ + .grpcCore, + .nioCore, + .nioHTTP2 + ] + ) static let cgrpcZlib: Target = .target( name: cgrpcZlibTargetName, @@ -251,6 +261,13 @@ extension Target { .grpcInProcessTransport, ] ) + + static let grpcHTTP2CoreTests: Target = .testTarget( + name: "GRPCHTTP2CoreTests", + dependencies: [ + .grpcHTTP2Core + ] + ) static let grpcCodeGenTests: Target = .testTarget( name: "GRPCCodeGenTests", @@ -591,11 +608,13 @@ let package = Package( .grpcCore, .grpcInProcessTransport, .grpcCodeGen, + .grpcHTTP2Core, // v2 tests .grpcCoreTests, .grpcInProcessTransportTests, - .grpcCodeGenTests + .grpcCodeGenTests, + .grpcHTTP2CoreTests ] ) diff --git a/Sources/GRPCHTTP2Core/README.md b/Sources/GRPCHTTP2Core/README.md new file mode 100644 index 000000000..a0f051cc7 --- /dev/null +++ b/Sources/GRPCHTTP2Core/README.md @@ -0,0 +1 @@ +# gRPC HTTP2 Core diff --git a/Tests/GRPCHTTP2CoreTests/GRPCHTTP2CoreTests.swift b/Tests/GRPCHTTP2CoreTests/GRPCHTTP2CoreTests.swift new file mode 100644 index 000000000..3630df68b --- /dev/null +++ b/Tests/GRPCHTTP2CoreTests/GRPCHTTP2CoreTests.swift @@ -0,0 +1,17 @@ +/* + * Copyright 2024, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Add tests to this package. From a939a6e97ddd8a2463af90d92d39be30c5ab5109 Mon Sep 17 00:00:00 2001 From: Gus Cairo Date: Thu, 11 Jan 2024 13:34:18 +0000 Subject: [PATCH 2/3] Add GRPCHTTP2TransportNIOPosix module --- Package.swift | 19 ++++++++++++++++++- Sources/GRPCHTTP2TransportNIOPosix/README.md | 1 + .../GRPCHTTP2TransportNIOPosixTests.swift | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Sources/GRPCHTTP2TransportNIOPosix/README.md create mode 100644 Tests/GRPCHTTP2TransportNIOPosixTests/GRPCHTTP2TransportNIOPosixTests.swift diff --git a/Package.swift b/Package.swift index d3695ed4e..c77e026f0 100644 --- a/Package.swift +++ b/Package.swift @@ -135,6 +135,7 @@ extension Target.Dependency { static let grpcCore: Self = .target(name: "GRPCCore") static let grpcInProcessTransport: Self = .target(name: "GRPCInProcessTransport") static let grpcHTTP2Core: Self = .target(name: "GRPCHTTP2Core") + static let grpcHTTP2TransportNIOPosix: Self = .target(name: "GRPCHTTP2TransportNIOPosix") } // MARK: - Targets @@ -187,6 +188,13 @@ extension Target { .nioHTTP2 ] ) + + static let grpcHTTP2TransportNIOPosix: Target = .target( + name: "GRPCHTTP2TransportNIOPosix", + dependencies: [ + .grpcHTTP2Core + ] + ) static let cgrpcZlib: Target = .target( name: cgrpcZlibTargetName, @@ -268,6 +276,13 @@ extension Target { .grpcHTTP2Core ] ) + + static let grpcHTTP2TransportNIOPosixTests: Target = .testTarget( + name: "GRPCHTTP2TransportNIOPosixTests", + dependencies: [ + .grpcHTTP2TransportNIOPosix + ] + ) static let grpcCodeGenTests: Target = .testTarget( name: "GRPCCodeGenTests", @@ -609,12 +624,14 @@ let package = Package( .grpcInProcessTransport, .grpcCodeGen, .grpcHTTP2Core, + .grpcHTTP2TransportNIOPosix, // v2 tests .grpcCoreTests, .grpcInProcessTransportTests, .grpcCodeGenTests, - .grpcHTTP2CoreTests + .grpcHTTP2CoreTests, + .grpcHTTP2TransportNIOPosixTests ] ) diff --git a/Sources/GRPCHTTP2TransportNIOPosix/README.md b/Sources/GRPCHTTP2TransportNIOPosix/README.md new file mode 100644 index 000000000..635ca3410 --- /dev/null +++ b/Sources/GRPCHTTP2TransportNIOPosix/README.md @@ -0,0 +1 @@ +# gRPC HTTP2 Transport NIO POSIX diff --git a/Tests/GRPCHTTP2TransportNIOPosixTests/GRPCHTTP2TransportNIOPosixTests.swift b/Tests/GRPCHTTP2TransportNIOPosixTests/GRPCHTTP2TransportNIOPosixTests.swift new file mode 100644 index 000000000..3630df68b --- /dev/null +++ b/Tests/GRPCHTTP2TransportNIOPosixTests/GRPCHTTP2TransportNIOPosixTests.swift @@ -0,0 +1,17 @@ +/* + * Copyright 2024, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Add tests to this package. From 73dba5e29aac14c9e0347254d2154dbaad8ce40b Mon Sep 17 00:00:00 2001 From: Gus Cairo Date: Thu, 11 Jan 2024 13:49:25 +0000 Subject: [PATCH 3/3] Add GRPCHTTP2TransportNIOTransportServices module --- Package.swift | 19 ++++++++++++++++++- .../README.md | 1 + ...P2TransportNIOTransportServicesTests.swift | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Sources/GRPCHTTP2TransportNIOTransportServices/README.md create mode 100644 Tests/GRPCHTTP2TransportNIOTransportServicesTests/GRPCHTTP2TransportNIOTransportServicesTests.swift diff --git a/Package.swift b/Package.swift index c77e026f0..201ba8e56 100644 --- a/Package.swift +++ b/Package.swift @@ -136,6 +136,7 @@ extension Target.Dependency { static let grpcInProcessTransport: Self = .target(name: "GRPCInProcessTransport") static let grpcHTTP2Core: Self = .target(name: "GRPCHTTP2Core") static let grpcHTTP2TransportNIOPosix: Self = .target(name: "GRPCHTTP2TransportNIOPosix") + static let grpcHTTP2TransportNIOTransportServices: Self = .target(name: "GRPCHTTP2TransportNIOTransportServices") } // MARK: - Targets @@ -195,6 +196,13 @@ extension Target { .grpcHTTP2Core ] ) + + static let grpcHTTP2TransportNIOTransportServices: Target = .target( + name: "GRPCHTTP2TransportNIOTransportServices", + dependencies: [ + .grpcHTTP2Core + ] + ) static let cgrpcZlib: Target = .target( name: cgrpcZlibTargetName, @@ -283,6 +291,13 @@ extension Target { .grpcHTTP2TransportNIOPosix ] ) + + static let grpcHTTP2TransportNIOTransportServicesTests: Target = .testTarget( + name: "GRPCHTTP2TransportNIOTransportServicesTests", + dependencies: [ + .grpcHTTP2TransportNIOTransportServices + ] + ) static let grpcCodeGenTests: Target = .testTarget( name: "GRPCCodeGenTests", @@ -625,13 +640,15 @@ let package = Package( .grpcCodeGen, .grpcHTTP2Core, .grpcHTTP2TransportNIOPosix, + .grpcHTTP2TransportNIOTransportServices, // v2 tests .grpcCoreTests, .grpcInProcessTransportTests, .grpcCodeGenTests, .grpcHTTP2CoreTests, - .grpcHTTP2TransportNIOPosixTests + .grpcHTTP2TransportNIOPosixTests, + .grpcHTTP2TransportNIOTransportServicesTests ] ) diff --git a/Sources/GRPCHTTP2TransportNIOTransportServices/README.md b/Sources/GRPCHTTP2TransportNIOTransportServices/README.md new file mode 100644 index 000000000..46303d13a --- /dev/null +++ b/Sources/GRPCHTTP2TransportNIOTransportServices/README.md @@ -0,0 +1 @@ +# gRPC HTTP2 Transport NIO Transport Services diff --git a/Tests/GRPCHTTP2TransportNIOTransportServicesTests/GRPCHTTP2TransportNIOTransportServicesTests.swift b/Tests/GRPCHTTP2TransportNIOTransportServicesTests/GRPCHTTP2TransportNIOTransportServicesTests.swift new file mode 100644 index 000000000..3630df68b --- /dev/null +++ b/Tests/GRPCHTTP2TransportNIOTransportServicesTests/GRPCHTTP2TransportNIOTransportServicesTests.swift @@ -0,0 +1,17 @@ +/* + * Copyright 2024, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Add tests to this package.