Skip to content

Commit c84000b

Browse files
author
Karim Alweheshy
committed
update to split 3rd party libs
1 parent 5a926d5 commit c84000b

File tree

20 files changed

+201
-82
lines changed

20 files changed

+201
-82
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ common --incompatible_allow_tags_propagation
44
# Fail if a glob doesn't match anything (https://github.com/bazelbuild/bazel/issues/8195)
55
build --incompatible_disallow_empty_glob
66

7-
build --host_macos_minimum_os=13.0
8-
build --macos_minimum_os=13.0
7+
build --host_macos_minimum_os=15.0
8+
build --macos_minimum_os=15.0
99

1010
# We don't need to bump some of our dependencies, just becuse our dev
1111
# dependencies cause us to use a newer version

MODULE.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ use_repo(
3333
"com_github_apple_swift_nio_transport_services",
3434
"com_github_apple_swift_protobuf",
3535
"com_github_grpc_grpc_swift",
36+
"com_github_grpc_grpc_swift_protobuf",
37+
"com_github_grpc_grpc_swift_nio_transport",
3638
)
3739

3840
apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")

doc/proto_migration.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,6 @@ swift_proto_library(
221221
],
222222
protos = [":service_proto"],
223223
)
224-
225-
swift_proto_library(
226-
name = "service_test_client_swift_proto",
227-
additional_compiler_info = {
228-
"ExtraModuleImports": "examples_xplatform_grpc_service_client_swift_proto",
229-
},
230-
compiler_deps = [
231-
":service_client_swift_proto",
232-
],
233-
compilers = ["@build_bazel_rules_swift//proto/compilers:swift_test_client_proto"],
234-
protos = [":service_proto"],
235-
)
236224
```
237225

238226
Note here that we don't need the intermediate `swift_proto_library` target,

examples/xplatform/grpc/BUILD

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ swift_binary(
2020
srcs = ["server_main.swift"],
2121
deps = [
2222
"//examples/xplatform/grpc/service:service_server_swift_proto",
23+
"@com_github_apple_swift_nio//:NIO",
24+
"@com_github_apple_swift_nio//:NIOCore",
2325
],
2426
)
2527

@@ -28,6 +30,8 @@ swift_binary(
2830
srcs = ["client_main.swift"],
2931
deps = [
3032
"//examples/xplatform/grpc/service:service_client_swift_proto",
33+
"@com_github_apple_swift_nio//:NIO",
34+
"@com_github_apple_swift_nio//:NIOCore",
3135
],
3236
)
3337

@@ -39,6 +43,8 @@ swift_test(
3943
deps = [
4044
"//examples/xplatform/grpc/service:service_client_swift_proto",
4145
"//examples/xplatform/grpc/service:service_server_swift_proto",
46+
"@com_github_apple_swift_nio//:NIO",
47+
"@com_github_apple_swift_nio//:NIOCore",
4248
],
4349
)
4450

@@ -50,5 +56,7 @@ swift_test(
5056
deps = [
5157
"//examples/xplatform/grpc/service:service_client_swift_proto",
5258
"//examples/xplatform/grpc/service:service_test_client_swift_proto",
59+
"@com_github_apple_swift_nio//:NIO",
60+
"@com_github_apple_swift_nio//:NIOCore",
5361
],
5462
)

examples/xplatform/grpc/client_main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Foundation
1616
import SwiftProtobuf
17-
import GRPC
17+
import GRPCCore
1818
import NIOCore
1919
import NIOPosix
2020
import ServiceClient

examples/xplatform/grpc/client_unit_test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import ServiceClient
1616
import ServiceServer
17-
import GRPC
17+
import GRPCCore
1818
import NIOCore
1919
import NIOPosix
2020
import XCTest

examples/xplatform/grpc/server_main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import Dispatch
16-
import GRPC
16+
import GRPCCore
1717
import NIOCore
1818
import NIOPosix
1919
import ServiceServer

examples/xplatform/grpc/test_client_unit_test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import ServiceClient
1616
import ServiceTestClient
17-
import GRPC
17+
import GRPCCore
1818
import NIOCore
1919
import NIOPosix
2020
import XCTest

examples/xplatform/proto_library_group/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ swift_binary(
66
srcs = ["server_main.swift"],
77
deps = [
88
"//examples/xplatform/proto_library_group/service:service_server_swift_proto",
9+
"@com_github_apple_swift_nio//:NIO",
10+
"@com_github_apple_swift_nio//:NIOCore",
911
],
1012
)
1113

@@ -14,6 +16,8 @@ swift_binary(
1416
srcs = ["client_main.swift"],
1517
deps = [
1618
"//examples/xplatform/proto_library_group/service:service_client_swift_proto",
19+
"@com_github_apple_swift_nio//:NIO",
20+
"@com_github_apple_swift_nio//:NIOCore",
1721
],
1822
)
1923

@@ -25,5 +29,7 @@ swift_test(
2529
deps = [
2630
"//examples/xplatform/proto_library_group/service:service_client_swift_proto",
2731
"//examples/xplatform/proto_library_group/service:service_server_swift_proto",
32+
"@com_github_apple_swift_nio//:NIO",
33+
"@com_github_apple_swift_nio//:NIOCore",
2834
],
2935
)

examples/xplatform/proto_library_group/client_main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Foundation
1616
import SwiftProtobuf
17-
import GRPC
17+
import GRPCCore
1818
import NIOCore
1919
import NIOPosix
2020
import examples_xplatform_proto_library_group_request_request_proto

0 commit comments

Comments
 (0)