Skip to content

Commit ade38fc

Browse files
srikrsna-bufsrikrsna-buf
authored
Update WORKSPACE versions to match MODULE (#48)
1 parent 906e911 commit ade38fc

15 files changed

Lines changed: 126 additions & 149 deletions

File tree

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414

1515
"Bazel module definition for bzlmod"
16+
1617
module(
1718
name = "rules_buf",
1819
version = "0.0.0", # Replaced when publishing
@@ -25,7 +26,6 @@ bazel_dep(name = "platforms", version = "0.0.4")
2526
# TODO: remove in the future
2627
bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")
2728
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
28-
2929
bazel_dep(name = "rules_go", version = "0.42.0", repo_name = "io_bazel_rules_go")
3030
bazel_dep(name = "bazel_skylib", version = "1.5.0")
3131

@@ -34,7 +34,6 @@ bazel_dep(name = "gazelle", version = "0.34.0", repo_name = "bazel_gazelle")
3434

3535
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
3636
go_deps.from_file(go_mod = "//:go.mod")
37-
3837
use_repo(
3938
go_deps,
4039
"com_github_bazelbuild_buildtools",
@@ -48,4 +47,5 @@ use_repo(non_module_deps, "bazel_gazelle_go_repository_tools")
4847

4948
ext = use_extension("//buf:extensions.bzl", "buf")
5049
use_repo(ext, "rules_buf_toolchains")
50+
5151
register_toolchains("@rules_buf_toolchains//:all")

‎WORKSPACE‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ load("//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_toolchains")
1818

1919
rules_buf_dependencies()
2020

21-
rules_buf_toolchains(version = "v1.0.0-rc12")
21+
rules_buf_toolchains(
22+
sha256 = "05dfb45d2330559d258e1230f5a25e154f0a328afda2a434348b5ba4c124ece7",
23+
version = "v1.28.1",
24+
)
2225

2326
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
2427

@@ -52,19 +55,19 @@ stardoc_repositories()
5255

5356
http_archive(
5457
name = "io_bazel_rules_go",
55-
sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
58+
sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
5659
urls = [
57-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
58-
"https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
60+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
61+
"https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
5962
],
6063
)
6164

6265
http_archive(
6366
name = "bazel_gazelle",
64-
sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
67+
sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
6568
urls = [
66-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
67-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
69+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
70+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
6871
],
6972
)
7073

@@ -77,15 +80,15 @@ go_repositories()
7780

7881
go_rules_dependencies()
7982

80-
go_register_toolchains(version = "1.18.3")
83+
go_register_toolchains(version = "1.21.1")
8184

8285
gazelle_dependencies()
8386

8487
http_archive(
8588
name = "com_github_bazelbuild_buildtools",
86-
sha256 = "ae34c344514e08c23e90da0e2d6cb700fcd28e80c02e23e4d5715dddcb42f7b3",
87-
strip_prefix = "buildtools-4.2.2",
89+
sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
90+
strip_prefix = "buildtools-6.4.0",
8891
urls = [
89-
"https://github.com/bazelbuild/buildtools/archive/refs/tags/4.2.2.tar.gz",
92+
"https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.4.0.tar.gz",
9093
],
9194
)

‎buf/extensions.bzl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ See https://bazel.build/docs/bzlmod#extension-definition
1919
load("//buf/internal:toolchain.bzl", "buf_download_releases")
2020
load("//buf/internal:repo.bzl", "buf_dependencies")
2121

22-
# NB: this should be updated periodically
23-
_DEFAULT_VERSION = "v1.27.0"
22+
_DEFAULT_VERSION = "v1.28.1"
2423
_DEFAULT_TOOLCHAIN_NAME = "rules_buf_toolchains"
2524
_DEFAULT_DEPS = "buf_deps"
2625

‎buf/internal/dependencies.bzl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1919

2020
bazel_dependencies = {
2121
"bazel_skylib": {
22-
"sha256": "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
22+
"sha256": "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
2323
"urls": [
24-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
25-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
24+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
25+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
2626
],
2727
},
2828
"rules_proto": {
29-
"sha256": "e017528fd1c91c5a33f15493e3a398181a9e821a804eb7ff5acdd1d2d6c2b18d",
30-
"strip_prefix": "rules_proto-4.0.0-3.20.0",
29+
"sha256": "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
30+
"strip_prefix": "rules_proto-5.3.0-21.7",
3131
"urls": [
32-
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0-3.20.0.tar.gz",
32+
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
3333
],
3434
},
3535
}

‎examples/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Examples on how to use `rules_buf` in various scenarios. For more info refer to
44

55
## Scenarios
66

7+
### [bzlmod](bzlmod)
8+
9+
This demonstrates using this repo with [bzlmod](https://docs.bazel.build/versions/5.0.0/bzlmod.html).
10+
711
### [Version](version)
812

913
This demonstrates basic setup and pinning a `buf` cli version. This also demonstrates using the `buf` cli as a bazel toolchain.
@@ -18,4 +22,4 @@ This demonstrates setting up lint and breaking tests in a project with a `buf.ya
1822

1923
### [Workspaces](workspace)
2024

21-
This demonstrates setting up lint and breaking tests in a [buf workspace](https://docs.buf.build/reference/workspaces) project.
25+
This demonstrates setting up lint and breaking tests in a [buf workspace](https://docs.buf.build/reference/workspaces) project.

‎examples/bzlmod/MODULE.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
# limitations under the License.
1414

1515
"Bazel dependencies"
16-
bazel_dep(name = "rules_buf", dev_dependency = True, version = "0.0.0")
17-
bazel_dep(name = "gazelle", dev_dependency = True, version = "0.34.0")
16+
17+
bazel_dep(name = "rules_buf", version = "0.0.0", dev_dependency = True)
18+
bazel_dep(name = "gazelle", version = "0.34.0", dev_dependency = True)
1819

1920
local_path_override(
2021
module_name = "rules_buf",

‎examples/gazelle/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gazelle(
2020
)
2121

2222
gazelle(
23-
name = "gazelle-update-repos",
23+
name = "gazelle_update_repos",
2424
args = [
2525
# This can also be `buf.yaml` and `buf.lock`
2626
"--from_file=buf.work.yaml",

‎examples/gazelle/WORKSPACE‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ load("@rules_buf//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_to
77

88
rules_buf_dependencies()
99

10-
rules_buf_toolchains(version = "v1.5.0")
10+
rules_buf_toolchains(
11+
sha256 = "05dfb45d2330559d258e1230f5a25e154f0a328afda2a434348b5ba4c124ece7",
12+
version = "v1.28.1",
13+
)
1114

1215
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
1316

@@ -21,37 +24,28 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2124

2225
http_archive(
2326
name = "io_bazel_rules_go",
24-
sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
27+
sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
2528
urls = [
26-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
27-
"https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
29+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
30+
"https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
2831
],
2932
)
3033

3134
http_archive(
3235
name = "bazel_gazelle",
33-
sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
36+
sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
3437
urls = [
35-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
36-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
38+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
39+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
3740
],
3841
)
3942

4043
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
41-
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
42-
43-
# Tempory fix for gazelle 0.25.0: https://github.com/bazelbuild/bazel-gazelle/issues/1217#issuecomment-1121223764
44-
go_repository(
45-
name = "org_golang_x_mod",
46-
build_external = "external",
47-
importpath = "golang.org/x/mod",
48-
sum = "h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=",
49-
version = "v0.6.0-dev.0.20220106191415-9b9b3d81d5e3",
50-
)
44+
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
5145

5246
go_rules_dependencies()
5347

54-
go_register_toolchains(version = "1.18.3")
48+
go_register_toolchains(version = "1.21.1")
5549

5650
gazelle_dependencies()
5751

‎examples/single_module/WORKSPACE‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ load("@rules_buf//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_to
77

88
rules_buf_dependencies()
99

10-
rules_buf_toolchains(version = "v1.5.0")
10+
rules_buf_toolchains(
11+
sha256 = "05dfb45d2330559d258e1230f5a25e154f0a328afda2a434348b5ba4c124ece7",
12+
version = "v1.28.1",
13+
)
1114

1215
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
1316

‎examples/single_module/bar/v1/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ proto_library(
2424
buf_lint_test(
2525
name = "bar_proto_lint",
2626
config = "//:buf.yaml",
27-
targets = [":bar_proto"],
2827
error_format = "config-ignore-yaml",
28+
targets = [":bar_proto"],
2929
)

0 commit comments

Comments
 (0)