Skip to content

Commit 1f5808b

Browse files
authored
Update bazel version to 6.1.0. (#101)
1 parent 20e58e7 commit 1f5808b

File tree

6 files changed

+33
-53
lines changed

6 files changed

+33
-53
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0
1+
6.1.0

WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
################################################################################
1616
#
1717

18+
workspace(name = "grpc-httpjson-transcoding")
19+
1820
load(
1921
"//:repositories.bzl",
2022
"absl_repositories",

bazel/external/BUILD

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright 2024 Google Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+

bazel/external/googletest.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/BUILD.bazel b/BUILD.bazel
2+
index 8099642a85..3598661079 100644
3+
--- a/BUILD.bazel
4+
+++ b/BUILD.bazel
5+
@@ -40,7 +40,7 @@ exports_files(["LICENSE"])
6+
7+
config_setting(
8+
name = "windows",
9+
- constraint_values = ["@bazel_tools//platforms:windows"],
10+
+ constraint_values = ["@platforms//os:windows"],
11+
)
12+
13+
config_setting(

repositories.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ def googletest_repositories(bind = True):
112112
strip_prefix = "googletest-" + GOOGLETEST_COMMIT,
113113
url = "https://github.com/google/googletest/archive/" + GOOGLETEST_COMMIT + ".tar.gz",
114114
sha256 = GOOGLETEST_SHA256,
115+
patches = ["@grpc-httpjson-transcoding//bazel/external:googletest.patch"],
116+
patch_args = ["-p1"],
115117
)
116118

117119
GOOGLEAPIS_COMMIT = "1d5522ad1056f16a6d593b8f3038d831e64daeea" # Sept 03, 2020

script/check-style

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)