bazel: update to 4.1.0

.bazelversion

@@ -1 +1 @@
-3.6.0
+4.1.0

bazel/apple_test.bzl

@@ -25,7 +25,7 @@ def envoy_mobile_swift_test(name, srcs, data = [], deps = []):
         srcs = srcs,
         data = data,
         deps = [
-            "//library/swift:ios_framework_archive",
+            "//library/swift:ios_lib",
         ] + deps,
         linkopts = ["-lresolv.9"],
         visibility = ["//visibility:private"],

bazel/envoy_mobile_repositories.bzl

@@ -15,24 +15,6 @@ def envoy_mobile_repositories():
     python_repos()
 
 def upstream_envoy_overrides():
-    # Patch protobuf to prevent duplicate symbols: https://github.com/lyft/envoy-mobile/issues/617
-    # More details: https://github.com/protocolbuffers/protobuf/issues/7046
-    # TODO: Remove after https://github.com/bazelbuild/bazel/pull/10493 is merged to Bazel
-    # Reverts:
-    # - https://github.com/protocolbuffers/protobuf/commit/7b28278c7d4f4175e70aef2f89d304696eb85ae3
-    # - https://github.com/protocolbuffers/protobuf/commit/a03d332aca5d33c5d4b2cd25037c9e37d57eff02
-    http_archive(
-        name = "com_google_protobuf",
-        patch_args = ["-p1"],
-        patches = [
-            "@envoy//bazel:protobuf.patch",
-            "@envoy_mobile//bazel:protobuf.patch",
-        ],
-        sha256 = "d7371dc2d46fddac1af8cb27c0394554b068768fc79ecaf5be1a1863e8ff3392",
-        strip_prefix = "protobuf-3.16.0",
-        urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.16.0/protobuf-all-3.16.0.tar.gz"],
-    )
-
     # Workaround old NDK version breakages https://github.com/lyft/envoy-mobile/issues/934
     http_archive(
         name = "com_github_libevent_libevent",
@@ -84,8 +66,8 @@ def swift_repos():
 
     http_archive(
         name = "build_bazel_rules_swift",
-        sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
-        url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
+        sha256 = "a228a8e41fdc165a2c55924b728c466e0086f3e638a05d6da98aa6222cbb19c1",
+        url = "https://github.com/bazelbuild/rules_swift/releases/download/0.16.1/rules_swift.0.16.1.tar.gz",
     )
 
 def kotlin_repos():

bazel/swift_header_collector.bzl

@@ -0,0 +1,27 @@
+"""
+Propagate the generated Swift header from a swift_library target
+This exists to work around https://github.com/bazelbuild/rules_swift/issues/291
+"""
+
+def _swift_header_collector(ctx):
+    headers = [
+        DefaultInfo(
+            files = ctx.attr.library[CcInfo].compilation_context.headers,
+        ),
+    ]
+
+    if len(headers[0].files.to_list()) != 1:
+        header_names = [header.basename for header in headers[0].files.to_list()]
+        fail("Expected exactly 1 '-Swift.h' header, got {}".format(header_names))
+
+    return headers
+
+swift_header_collector = rule(
+    attrs = dict(
+        library = attr.label(
+            mandatory = True,
+            providers = [CcInfo],
+        ),
+    ),
+    implementation = _swift_header_collector,
+)

envoy-mobile.tulsiproj/Configs/all.tulsigen

@@ -8,7 +8,7 @@
     "//examples/objective-c/hello_world:appmain",
     "//examples/swift/hello_world:app",
     "//examples/swift/hello_world:appmain",
-    "//library/swift:ios_framework_archive",
+    "//library/swift:ios_lib",
     "//test/swift/integration:cancel_stream_test",
     "//test/swift/integration:cancel_stream_test_lib",
     "//test/swift/integration:direct_response_contains_headers_integration_test",

examples/objective-c/hello_world/ViewController.m

@@ -1,4 +1,4 @@
-#import <Envoy/Envoy-Swift.h>
+#import <Envoy/Envoy.h>
 #import <UIKit/UIKit.h>
 #import "Result.h"
 #import "ViewController.h"

library/swift/BUILD

@@ -1,9 +1,11 @@
-load("@envoy_mobile//bazel:swift_static_framework.bzl", "swift_static_framework")
+load("@build_bazel_rules_apple//apple:ios.bzl", "ios_static_framework")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load("//bazel:swift_header_collector.bzl", "swift_header_collector")
 
 licenses(["notice"])  # Apache 2
 
-swift_static_framework(
-    name = "ios_framework",
+swift_library(
+    name = "ios_lib",
     srcs = glob([
         "DirectResponse.swift",
         "Engine.swift",
@@ -44,3 +46,17 @@ swift_static_framework(
     private_deps = ["//library/objective-c:envoy_engine_objc_lib"],
     visibility = ["//visibility:public"],
 )
+
+swift_header_collector(
+    name = "ios_lib_headers",
+    library = "ios_lib",
+)
+
+ios_static_framework(
+    name = "ios_framework",
+    hdrs = ["ios_lib_headers"],
+    bundle_name = "Envoy",
+    minimum_os_version = "11.0",
+    visibility = ["//visibility:public"],
+    deps = ["ios_lib"],
+)