Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove '@_exported import GRPCCore' #2109

Merged
merged 4 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Examples/echo/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ let package = Package(
name: "echo",
platforms: [.macOS("15.0")],
dependencies: [
.package(url: "https://github.com/grpc/grpc-swift", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/grpc/grpc-swift-protobuf", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/grpc/grpc-swift-nio-transport", branch: "1.0.0-alpha.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
Expand All @@ -29,6 +30,7 @@ let package = Package(
.executableTarget(
name: "echo",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
Expand Down
2 changes: 2 additions & 0 deletions Examples/hello-world/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ let package = Package(
name: "hello-world",
platforms: [.macOS("15.0")],
dependencies: [
.package(url: "https://github.com/grpc/grpc-swift", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/grpc/grpc-swift-protobuf", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/grpc/grpc-swift-nio-transport", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
Expand All @@ -29,6 +30,7 @@ let package = Package(
.executableTarget(
name: "hello-world",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
Expand Down
1 change: 1 addition & 0 deletions Examples/hello-world/Sources/Subcommands/Greet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import ArgumentParser
import GRPCNIOCore
import GRPCNIOTransportHTTP2
import GRPCProtobuf

Expand Down
1 change: 1 addition & 0 deletions Examples/hello-world/Sources/Subcommands/Serve.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import ArgumentParser
import GRPCCore
import GRPCNIOTransportHTTP2
import GRPCProtobuf

Expand Down
2 changes: 2 additions & 0 deletions Examples/route-guide/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ let package = Package(
name: "route-guide",
platforms: [.macOS("15.0")],
dependencies: [
.package(url: "https://github.com/grpc/grpc-swift", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/grpc/grpc-swift-protobuf", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/grpc/grpc-swift-nio-transport", exact: "1.0.0-alpha.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
Expand All @@ -29,6 +30,7 @@ let package = Package(
.executableTarget(
name: "route-guide",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
Expand Down
1 change: 1 addition & 0 deletions Examples/route-guide/Sources/Subcommands/GetFeature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import ArgumentParser
import GRPCCore
import GRPCNIOTransportHTTP2

struct GetFeature: AsyncParsableCommand {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import ArgumentParser
import GRPCCore
import GRPCNIOTransportHTTP2

struct ListFeatures: AsyncParsableCommand {
Expand Down
1 change: 1 addition & 0 deletions Examples/route-guide/Sources/Subcommands/RecordRoute.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import ArgumentParser
import GRPCCore
import GRPCNIOTransportHTTP2

struct RecordRoute: AsyncParsableCommand {
Expand Down
1 change: 1 addition & 0 deletions Examples/route-guide/Sources/Subcommands/RouteChat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import ArgumentParser
import GRPCCore
import GRPCNIOTransportHTTP2

struct RouteChat: AsyncParsableCommand {
Expand Down
1 change: 1 addition & 0 deletions Examples/route-guide/Sources/Subcommands/Serve.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import ArgumentParser
import Foundation
import GRPCCore
import GRPCNIOTransportHTTP2
import GRPCProtobuf
import Synchronization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ let package = Package(
.executableTarget(
name: "RouteGuide",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ let package = Package(
.executableTarget(
name: "RouteGuide",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ let package = Package(
.executableTarget(
name: "RouteGuide",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ let package = Package(
.executableTarget(
name: "RouteGuide",
dependencies: [
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import GRPCNIOTransportHTTP2

extension RouteGuide {
func runClient() async throws {
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import GRPCCore
import GRPCNIOTransportHTTP2

extension RouteGuide {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@
Next we can add a target. In this tutorial we'll create a single executable target which
can act as both a client and a server.

We require two gRPC dependencies: `GRPCNIOTransportHTTP2"` provides an implementation of an HTTP/2
client and server, while `GRPCProtobuf` provides the necessary components to serialize
We require three gRPC dependencies: `GRPCCore` provides core abstractions and runtime
components, `GRPCNIOTransportHTTP2` provides an implementation of an HTTP/2
client and server, and `GRPCProtobuf` provides the necessary components to serialize
and deserialize `SwiftProtobuf` messages.

@Code(name: "Package.swift", file: "route-guide-sec01-step08-description.swift")
Expand Down
17 changes: 0 additions & 17 deletions Sources/GRPCInProcessTransport/Exports.swift

This file was deleted.

Loading