From f6d6f52cf11b2a473dbeefc1c232b5214f85e493 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Fri, 8 Oct 2021 11:34:22 +0100 Subject: [PATCH 1/4] deps: Bump `rules_antlr` -> 0.5.0 Signed-off-by: Ryan Northey --- bazel/repository_locations.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index ae5295c721c00..621f028e01077 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1078,8 +1078,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "ANTLR Rules for Bazel", project_desc = "Bazel rules for ANTLR", project_url = "https://github.com/marcohu/rules_antlr", - version = "3cc2f9502a54ceb7b79b37383316b23c4da66f9a", - sha256 = "7249d1569293d9b239e23c65f6b4c81a07da921738bde0dfeb231ed98be40429", + version = "0.5.0", + sha256 = "26e6a83c665cf6c1093b628b3a749071322f0f70305d12ede30909695ed85591", strip_prefix = "rules_antlr-{version}", urls = ["https://github.com/marcohu/rules_antlr/archive/{version}.tar.gz"], # ANTLR has a runtime component, so is not purely build. @@ -1092,7 +1092,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.filters.network.wasm", "envoy.stat_sinks.wasm", ], - release_date = "2019-06-21", + release_date = "2020-01-21", cpe = "N/A", ), antlr4_runtimes = dict( From 74125d8414d833c8b2808969f4091d578d1cff1d Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Mon, 25 Oct 2021 13:29:06 +0100 Subject: [PATCH 2/4] antlr-runtimes Signed-off-by: Ryan Northey --- bazel/repository_locations.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 621f028e01077..b08bbe664cd51 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1099,8 +1099,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "ANTLR v4", project_desc = "ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files", project_url = "https://github.com/antlr/antlr4", - version = "4.7.2", - sha256 = "46f5e1af5f4bd28ade55cb632f9a069656b31fc8c2408f9aa045f9b5f5caad64", + version = "4.9.2", + sha256 = "6c86ebe2f3583ac19b199e704bdff9d70379f12347f7f2f1efa38051cd9a18cf", strip_prefix = "antlr4-{version}", urls = ["https://github.com/antlr/antlr4/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -1112,7 +1112,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.filters.network.wasm", "envoy.stat_sinks.wasm", ], - release_date = "2018-12-18", + release_date = "2021-03-11", cpe = "N/A", ), com_github_fdio_vpp_vcl = dict( From c0d1640eda95483a803e4a069cc0b4c6642814f8 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Mon, 25 Oct 2021 15:55:54 +0100 Subject: [PATCH 3/4] antlr-deps Signed-off-by: Ryan Northey --- bazel/dependency_imports.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index b382e3fd02cd9..9f075c7527884 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -6,7 +6,7 @@ load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependenci load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies") load("@upb//bazel:workspace_deps.bzl", "upb_deps") load("@rules_rust//rust:repositories.bzl", "rust_repositories") -load("@rules_antlr//antlr:deps.bzl", "antlr_dependencies") +load("@rules_antlr//antlr:repositories.bzl", "rules_antlr_dependencies") load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies") load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") @@ -22,7 +22,7 @@ def envoy_dependency_imports(go_version = GO_VERSION): apple_rules_dependencies() rust_repositories() upb_deps() - antlr_dependencies(472) + rules_antlr_dependencies("4.9.2") proxy_wasm_rust_sdk_dependencies() rules_fuzzing_dependencies( oss_fuzz = True, From e0693716012b500f3031528e1d5822b92918ff1a Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 28 Oct 2021 14:08:18 +0100 Subject: [PATCH 4/4] use pr version for 4.9.2 Signed-off-by: Ryan Northey --- bazel/repository_locations.bzl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index b08bbe664cd51..c669a242e27a1 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1078,8 +1078,9 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "ANTLR Rules for Bazel", project_desc = "Bazel rules for ANTLR", project_url = "https://github.com/marcohu/rules_antlr", - version = "0.5.0", - sha256 = "26e6a83c665cf6c1093b628b3a749071322f0f70305d12ede30909695ed85591", + # https://github.com/marcohu/rules_antlr/pull/20 + version = "754a240944f127bcc2b4a3090f228926b768e21f", + sha256 = "5b4668a85e74cd0f37bb7d7e255bc415fa151afc6e9d33edeb4009c146c422ba", strip_prefix = "rules_antlr-{version}", urls = ["https://github.com/marcohu/rules_antlr/archive/{version}.tar.gz"], # ANTLR has a runtime component, so is not purely build.