update to split 3rd party libs

Karim Alweheshy · Karim Alweheshy · commit c84000bd1778 · 2025-03-05T12:43:38.000Z
diff --git a/.bazelrc b/.bazelrc
@@ -4,8 +4,8 @@ common --incompatible_allow_tags_propagation
 # Fail if a glob doesn't match anything (https://github.com/bazelbuild/bazel/issues/8195)
 build --incompatible_disallow_empty_glob
 
-build --host_macos_minimum_os=13.0
-build --macos_minimum_os=13.0
+build --host_macos_minimum_os=15.0
+build --macos_minimum_os=15.0
 
 # We don't need to bump some of our dependencies, just becuse our dev
 # dependencies cause us to use a newer version
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -33,6 +33,8 @@ use_repo(
     "com_github_apple_swift_nio_transport_services",
     "com_github_apple_swift_protobuf",
     "com_github_grpc_grpc_swift",
+    "com_github_grpc_grpc_swift_protobuf",
+    "com_github_grpc_grpc_swift_nio_transport",
 )
 
 apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")
diff --git a/doc/proto_migration.md b/doc/proto_migration.md
@@ -221,18 +221,6 @@ swift_proto_library(
     ],
     protos = [":service_proto"],
 )
-
-swift_proto_library(
-    name = "service_test_client_swift_proto",
-    additional_compiler_info = {
-        "ExtraModuleImports": "examples_xplatform_grpc_service_client_swift_proto",
-    },
-    compiler_deps = [
-        ":service_client_swift_proto",
-    ],
-    compilers = ["@build_bazel_rules_swift//proto/compilers:swift_test_client_proto"],
-    protos = [":service_proto"],
-)
 ```
 
 Note here that we don't need the intermediate `swift_proto_library` target,
diff --git a/examples/xplatform/grpc/BUILD b/examples/xplatform/grpc/BUILD
@@ -20,6 +20,8 @@ swift_binary(
     srcs = ["server_main.swift"],
     deps = [
         "//examples/xplatform/grpc/service:service_server_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
 
@@ -28,6 +30,8 @@ swift_binary(
     srcs = ["client_main.swift"],
     deps = [
         "//examples/xplatform/grpc/service:service_client_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
 
@@ -39,6 +43,8 @@ swift_test(
     deps = [
         "//examples/xplatform/grpc/service:service_client_swift_proto",
         "//examples/xplatform/grpc/service:service_server_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
 
@@ -50,5 +56,7 @@ swift_test(
     deps = [
         "//examples/xplatform/grpc/service:service_client_swift_proto",
         "//examples/xplatform/grpc/service:service_test_client_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
diff --git a/examples/xplatform/grpc/client_main.swift b/examples/xplatform/grpc/client_main.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import SwiftProtobuf
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import ServiceClient
diff --git a/examples/xplatform/grpc/client_unit_test.swift b/examples/xplatform/grpc/client_unit_test.swift
@@ -14,7 +14,7 @@
 
 import ServiceClient
 import ServiceServer
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import XCTest
diff --git a/examples/xplatform/grpc/server_main.swift b/examples/xplatform/grpc/server_main.swift
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import Dispatch
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import ServiceServer
diff --git a/examples/xplatform/grpc/test_client_unit_test.swift b/examples/xplatform/grpc/test_client_unit_test.swift
@@ -14,7 +14,7 @@
 
 import ServiceClient
 import ServiceTestClient
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import XCTest
diff --git a/examples/xplatform/proto_library_group/BUILD b/examples/xplatform/proto_library_group/BUILD
@@ -6,6 +6,8 @@ swift_binary(
     srcs = ["server_main.swift"],
     deps = [
         "//examples/xplatform/proto_library_group/service:service_server_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
 
@@ -14,6 +16,8 @@ swift_binary(
     srcs = ["client_main.swift"],
     deps = [
         "//examples/xplatform/proto_library_group/service:service_client_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
 
@@ -25,5 +29,7 @@ swift_test(
     deps = [
         "//examples/xplatform/proto_library_group/service:service_client_swift_proto",
         "//examples/xplatform/proto_library_group/service:service_server_swift_proto",
+        "@com_github_apple_swift_nio//:NIO",
+        "@com_github_apple_swift_nio//:NIOCore",
     ],
 )
diff --git a/examples/xplatform/proto_library_group/client_main.swift b/examples/xplatform/proto_library_group/client_main.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import SwiftProtobuf
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import examples_xplatform_proto_library_group_request_request_proto
diff --git a/examples/xplatform/proto_library_group/client_unit_test.swift b/examples/xplatform/proto_library_group/client_unit_test.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import XCTest
diff --git a/examples/xplatform/proto_library_group/server_main.swift b/examples/xplatform/proto_library_group/server_main.swift
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import Dispatch
-import GRPC
+import GRPCCore
 import NIOCore
 import NIOPosix
 import examples_xplatform_proto_library_group_request_request_proto
diff --git a/proto/compilers/swift_proto_compiler_macros.bzl b/proto/compilers/swift_proto_compiler_macros.bzl
@@ -77,7 +77,7 @@ def make_grpc_swift_proto_compiler(
         suffixes = [".grpc.swift"],
         deps = [
             "@com_github_apple_swift_protobuf//:SwiftProtobuf",
-            "@com_github_grpc_grpc_swift//:GRPC",
+            "@com_github_grpc_grpc_swift//:GRPCCodeGen",
         ],
         visibility = ["//visibility:public"],
     )
diff --git a/swift/repositories.bzl b/swift/repositories.bzl
@@ -125,6 +125,28 @@ def swift_rules_dependencies(include_bzlmod_ready_dependencies = True):
         ),
     )
 
+    _maybe(
+        http_archive,
+        name = "com_github_grpc_grpc_swift_nio_transport",
+        urls = ["https://github.com/grpc/grpc-swift-nio-transport/archive/1.0.0.tar.gz"],  # latest at time of writing
+        sha256 = "e590f7a30961802cbdf4f8cac37ae2dbc9ab2c8f8032c2ef2f66ed2b63623185",
+        strip_prefix = "grpc-swift-nio-transport-1.0.0/",
+        build_file = Label(
+            "//third_party:com_github_grpc_grpc_swift_nio_transport/BUILD.overlay",
+        ),
+    )
+
+    _maybe(
+        http_archive,
+        name = "com_github_grpc_grpc_swift_protobuf",
+        urls = ["https://github.com/grpc/grpc-swift-protobuf/archive/1.0.0.tar.gz"],  # latest at time of writing
+        sha256 = "c31969782aa710e002f9a6214a9eb1e4292800e3606c2a092b034b97fdff52ac",
+        strip_prefix = "grpc-swift-protobuf-1.0.0/",
+        build_file = Label(
+            "//third_party:com_github_grpc_grpc_swift_protobuf/BUILD.overlay",
+        ),
+    )
+
     _maybe(
         http_archive,
         name = "com_github_apple_swift_docc_symbolkit",
@@ -139,9 +161,9 @@ def swift_rules_dependencies(include_bzlmod_ready_dependencies = True):
     _maybe(
         http_archive,
         name = "com_github_apple_swift_nio",
-        urls = ["https://github.com/apple/swift-nio/archive/2.42.0.tar.gz"],  # pinned to grpc swift version
-        sha256 = "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0",
-        strip_prefix = "swift-nio-2.42.0/",
+        urls = ["https://github.com/apple/swift-nio/archive/2.78.0.tar.gz"],  # pinned to grpc swift version
+        sha256 = "7262fe6a134ce83fda666429ca88a511db517f36996955dafeb2068d66b7d260",
+        strip_prefix = "swift-nio-2.78.0/",
         build_file = Label(
             "//third_party:com_github_apple_swift_nio/BUILD.overlay",
         ),
@@ -150,9 +172,9 @@ def swift_rules_dependencies(include_bzlmod_ready_dependencies = True):
     _maybe(
         http_archive,
         name = "com_github_apple_swift_nio_http2",
-        urls = ["https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz"],  # pinned to grpc-swift version
-        sha256 = "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25",
-        strip_prefix = "swift-nio-http2-1.26.0/",
+        urls = ["https://github.com/apple/swift-nio-http2/archive/1.35.0.tar.gz"],  # pinned to grpc-swift version
+        sha256 = "ffc425d7e2737d17b80a0227f2b2823eb95bd76cb681906494e5b795f64f6f5c",
+        strip_prefix = "swift-nio-http2-1.35.0/",
         build_file = Label(
             "//third_party:com_github_apple_swift_nio_http2/BUILD.overlay",
         ),
@@ -194,9 +216,9 @@ def swift_rules_dependencies(include_bzlmod_ready_dependencies = True):
     _maybe(
         http_archive,
         name = "com_github_apple_swift_nio_ssl",
-        urls = ["https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz"],  # pinned to grpc swift version
-        sha256 = "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d",
-        strip_prefix = "swift-nio-ssl-2.23.0/",
+        urls = ["https://github.com/apple/swift-nio-ssl/archive/2.29.0.tar.gz"],  # pinned to grpc swift version
+        sha256 = "f35a05309d791ec5ff23e1b0cdff2962872e2388fa0e27fced57566bb0383ea4",
+        strip_prefix = "swift-nio-ssl-2.29.0/",
         build_file = Label(
             "//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay",
         ),
@@ -205,9 +227,9 @@ def swift_rules_dependencies(include_bzlmod_ready_dependencies = True):
     _maybe(
         http_archive,
         name = "com_github_apple_swift_collections",
-        urls = ["https://github.com/apple/swift-collections/archive/1.0.4.tar.gz"],  # pinned to swift-nio @ grpc-swift version
-        sha256 = "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096",
-        strip_prefix = "swift-collections-1.0.4/",
+        urls = ["https://github.com/apple/swift-collections/archive/1.1.3.tar.gz"],  # pinned to swift-nio @ grpc-swift version
+        sha256 = "7e5e48d0dc2350bed5919be5cf60c485e72a30bd1f2baf718a619317677b91db",
+        strip_prefix = "swift-collections-1.1.3/",
         build_file = Label(
             "//third_party:com_github_apple_swift_collections/BUILD.overlay",
         ),
diff --git a/third_party/com_github_apple_swift_collections/BUILD.overlay b/third_party/com_github_apple_swift_collections/BUILD.overlay
@@ -18,6 +18,9 @@ swift_library(
     srcs = glob([
         "Sources/DequeModule/**/*.swift",
     ]),
+    deps = [
+        ":InternalCollectionsUtilities",
+    ],
     module_name = "DequeModule",
     visibility = ["//visibility:public"],
 )
@@ -27,6 +30,18 @@ swift_library(
     srcs = glob([
         "Sources/OrderedCollections/**/*.swift",
     ]),
+    deps = [
+        ":InternalCollectionsUtilities",
+    ],
     module_name = "OrderedCollections",
     visibility = ["//visibility:public"],
 )
+
+swift_library(
+    name = "InternalCollectionsUtilities",
+    srcs = glob([
+        "Sources/InternalCollectionsUtilities/**/*.swift",
+    ]),
+    module_name = "InternalCollectionsUtilities",
+    visibility = ["//visibility:public"],
+)
diff --git a/third_party/com_github_apple_swift_nio/BUILD.overlay b/third_party/com_github_apple_swift_nio/BUILD.overlay
@@ -155,11 +155,24 @@ swift_library(
         ":CNIOLinux",
         ":CNIOWindows",
         ":NIOConcurrencyHelpers",
+        ":_NIODataStructures",
+        ":_NIOBase64",
         "@com_github_apple_swift_atomics//:Atomics",
         "@com_github_apple_swift_collections//:DequeModule",
     ],
 )
 
+swift_library(
+    name = "_NIOBase64",
+    srcs = glob([
+        "Sources/_NIOBase64/*.swift",
+    ]),
+    copts = [],
+    module_name = "_NIOBase64",
+    visibility = ["//visibility:public"],
+    deps = [],
+)
+
 swift_library(
     name = "NIOEmbedded",
     srcs = glob([
diff --git a/third_party/com_github_grpc_grpc_swift/BUILD.overlay b/third_party/com_github_grpc_grpc_swift/BUILD.overlay
@@ -1,62 +1,41 @@
-load("@build_bazel_rules_swift//swift:swift_binary.bzl", "swift_binary")
-load(
-    "@build_bazel_rules_swift//swift:swift_interop_hint.bzl",
-    "swift_interop_hint",
-)
 load("@build_bazel_rules_swift//swift:swift_library.bzl", "swift_library")
 
-cc_library(
-    name = "CGRPCZlib",
-    srcs = glob([
-        "Sources/CGRPCZlib/**/*.c",
-    ]),
-    hdrs = glob([
-        "Sources/CGRPCZlib/**/*.h",
-    ]),
-    aspect_hints = [":CGRPCZLIB_interop"],
-    includes = ["Sources/CGRPCZlib/include"],
-    linkopts = ["-lz"],
-)
-
-swift_interop_hint(
-    name = "CGRPCZLIB_interop",
-    module_name = "CGRPCZlib",
-)
-
 swift_library(
-    name = "GRPC",
+    name = "GRPCCodeGen",
     srcs = glob([
-        "Sources/GRPC/**/*.swift",
+        "Sources/GRPCCodeGen/**/*.swift",
     ]),
     defines = ["SWIFT_PACKAGE"],  # activates CgRPC imports
-    module_name = "GRPC",
+    module_name = "GRPCCodeGen",
+    package_name = "GRPCCodeGen",
     visibility = ["//visibility:public"],
-    deps = [
-        ":CGRPCZlib",
-        "@com_github_apple_swift_log//:Logging",
-        "@com_github_apple_swift_nio//:NIO",
-        "@com_github_apple_swift_nio//:NIOCore",
-        "@com_github_apple_swift_nio//:NIOEmbedded",
-        "@com_github_apple_swift_nio//:NIOFoundationCompat",
-        "@com_github_apple_swift_nio//:NIOHTTP1",
-        "@com_github_apple_swift_nio//:NIOPosix",
-        "@com_github_apple_swift_nio//:NIOTLS",
-        "@com_github_apple_swift_nio_extras//:NIOExtras",
-        "@com_github_apple_swift_nio_http2//:NIOHTTP2",
-        "@com_github_apple_swift_nio_ssl//:NIOSSL",
-        "@com_github_apple_swift_nio_transport_services//:NIOTransportServices",
-        "@com_github_apple_swift_protobuf//:SwiftProtobuf",
+    features = [
+        "swift.upcoming.ExistentialAny",
+        "swift.upcoming.InternalImportsByDefault",
+        "swift.upcoming.MemberImportVisibility",
+        "swift.enable_v6",
     ],
+    deps = [],
 )
 
-swift_binary(
-    name = "protoc-gen-grpc-swift",
+swift_library(
+    name = "GRPCCore",
     srcs = glob([
-        "Sources/protoc-gen-grpc-swift/*.swift",
+        "Sources/GRPCCore/**/*.swift",
+    ], exclude = [
+        "Sources/GRPCCore/Documentation.docc/**/*",
     ]),
+    defines = ["SWIFT_PACKAGE"],  # activates CgRPC imports
+    module_name = "GRPCCore",
+    package_name = "GRPCCore",
     visibility = ["//visibility:public"],
+    features = [
+        "swift.upcoming.ExistentialAny",
+        "swift.upcoming.InternalImportsByDefault",
+        "swift.upcoming.MemberImportVisibility",
+        "swift.enable_v6",
+    ],
     deps = [
-        "@com_github_apple_swift_protobuf//:SwiftProtobuf",
-        "@com_github_apple_swift_protobuf//:SwiftProtobufPluginLibrary",
+        "@com_github_apple_swift_collections//:DequeModule",
     ],
 )
diff --git a/third_party/com_github_grpc_grpc_swift_nio_transport/BUILD.overlay b/third_party/com_github_grpc_grpc_swift_nio_transport/BUILD.overlay
diff --git a/third_party/com_github_grpc_grpc_swift_protobuf/BUILD.overlay b/third_party/com_github_grpc_grpc_swift_protobuf/BUILD.overlay
diff --git a/tools/protoc_wrapper/BUILD b/tools/protoc_wrapper/BUILD

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ use_repo(`
`33`	`33`	`"com_github_apple_swift_nio_transport_services",`
`34`	`34`	`"com_github_apple_swift_protobuf",`
`35`	`35`	`"com_github_grpc_grpc_swift",`
	`36`	`+ "com_github_grpc_grpc_swift_protobuf",`
	`37`	`+ "com_github_grpc_grpc_swift_nio_transport",`
`36`	`38`	`)`
`37`	`39`
`38`	`40`	`apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")`