From fb0135d8fd030cea13e86a32b4b023dbc4aa3496 Mon Sep 17 00:00:00 2001 From: Kate Murphy Date: Mon, 1 Aug 2022 09:54:50 -0700 Subject: [PATCH 1/2] Depend on protobuf v21.0-rc1 --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 375671f..98e345e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,13 +1,13 @@ - workspace(name = "com_google_protobuf_javascript") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "com_google_protobuf", - urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.20.1.zip"], - strip_prefix = "protobuf-3.20.1", + strip_prefix = "protobuf-21.0-rc1", + urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.0-rc1.zip"], ) load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") + protobuf_deps() From 4dcdee280d02907d35ef48654a0a3ea93c945bd1 Mon Sep 17 00:00:00 2001 From: Kate Murphy Date: Mon, 1 Aug 2022 09:56:14 -0700 Subject: [PATCH 2/2] Include generator/well_known_types_embed.h as a source file --- generator/js_generator.cc | 2 +- generator/well_known_types_embed.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/js_generator.cc b/generator/js_generator.cc index 3b4ad88..97b5844 100644 --- a/generator/js_generator.cc +++ b/generator/js_generator.cc @@ -29,7 +29,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include +#include "generator/well_known_types_embed.h" #include #include #include diff --git a/generator/well_known_types_embed.cc b/generator/well_known_types_embed.cc index 5cb7365..ef18854 100644 --- a/generator/well_known_types_embed.cc +++ b/generator/well_known_types_embed.cc @@ -28,7 +28,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include +#include "generator/well_known_types_embed.h" struct FileToc well_known_types_js[] = { {"any.js",