| Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame^] | 1 | From a0f8916f104566a2538a70153c016de7c5d9f304 Mon Sep 17 00:00:00 2001 |
| 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Wed, 16 Mar 2022 18:54:11 +0100 |
| 4 | Subject: [PATCH] Use conventional import path for antlr |
| 5 | |
| 6 | --- |
| 7 | WORKSPACE | 9 +++++---- |
| 8 | checker/BUILD.bazel | 2 +- |
| 9 | parser/BUILD.bazel | 4 ++-- |
| 10 | parser/gen/BUILD.bazel | 2 +- |
| 11 | 4 files changed, 9 insertions(+), 8 deletions(-) |
| 12 | |
| 13 | diff --git a/WORKSPACE b/WORKSPACE |
| 14 | index 4238e7a..b62cf15 100644 |
| 15 | --- a/WORKSPACE |
| 16 | +++ b/WORKSPACE |
| 17 | @@ -99,11 +99,12 @@ go_repository( |
| 18 | version = "v0.3.2", |
| 19 | ) |
| 20 | |
| 21 | -# Antlr deps to pickup golang concurrency fixes 4/30/2020 |
| 22 | +# Antlr deps |
| 23 | go_repository( |
| 24 | - name = "com_github_antlr", |
| 25 | - commit = "621b933c7a7f01c67ae9de15103151fa0f9d6d90", |
| 26 | - importpath = "github.com/antlr/antlr4", |
| 27 | + name = "com_github_antlr_antlr4_runtime_go_antlr", |
| 28 | + importpath = "github.com/antlr/antlr4/runtime/Go/antlr", |
| 29 | + sum = "h1:zvkJv+9Pxm1nnEMcKnShREt4qtduHKz4iw4AB4ul0Ao=", |
| 30 | + version = "v0.0.0-20220209173558-ad29539cd2e9", |
| 31 | ) |
| 32 | |
| 33 | # CEL Spec deps |
| 34 | diff --git a/checker/BUILD.bazel b/checker/BUILD.bazel |
| 35 | index 2ef326b..bec40b6 100644 |
| 36 | --- a/checker/BUILD.bazel |
| 37 | +++ b/checker/BUILD.bazel |
| 38 | @@ -54,7 +54,7 @@ go_test( |
| 39 | "//test:go_default_library", |
| 40 | "//test/proto2pb:go_default_library", |
| 41 | "//test/proto3pb:go_default_library", |
| 42 | - "@com_github_antlr//runtime/Go/antlr:go_default_library", |
| 43 | + "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library", |
| 44 | "@org_golang_google_protobuf//proto:go_default_library", |
| 45 | ], |
| 46 | ) |
| 47 | diff --git a/parser/BUILD.bazel b/parser/BUILD.bazel |
| 48 | index a1917b4..b76e6e4 100644 |
| 49 | --- a/parser/BUILD.bazel |
| 50 | +++ b/parser/BUILD.bazel |
| 51 | @@ -23,7 +23,7 @@ go_library( |
| 52 | "//common/operators:go_default_library", |
| 53 | "//common/runes:go_default_library", |
| 54 | "//parser/gen:go_default_library", |
| 55 | - "@com_github_antlr//runtime/Go/antlr:go_default_library", |
| 56 | + "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library", |
| 57 | "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", |
| 58 | "@org_golang_google_protobuf//proto:go_default_library", |
| 59 | "@org_golang_google_protobuf//types/known/structpb:go_default_library", |
| 60 | @@ -45,7 +45,7 @@ go_test( |
| 61 | "//common/debug:go_default_library", |
| 62 | "//parser/gen:go_default_library", |
| 63 | "//test:go_default_library", |
| 64 | - "@com_github_antlr//runtime/Go/antlr:go_default_library", |
| 65 | + "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library", |
| 66 | "@org_golang_google_protobuf//proto:go_default_library", |
| 67 | ], |
| 68 | ) |
| 69 | diff --git a/parser/gen/BUILD.bazel b/parser/gen/BUILD.bazel |
| 70 | index 78e0432..2271131 100644 |
| 71 | --- a/parser/gen/BUILD.bazel |
| 72 | +++ b/parser/gen/BUILD.bazel |
| 73 | @@ -21,6 +21,6 @@ go_library( |
| 74 | ], |
| 75 | importpath = "github.com/google/cel-go/parser/gen", |
| 76 | deps = [ |
| 77 | - "@com_github_antlr//runtime/Go/antlr:go_default_library", |
| 78 | + "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library", |
| 79 | ], |
| 80 | ) |
| 81 | -- |
| 82 | 2.25.1 |
| 83 | |