Skip to content

Commit 5f81b37

Browse files
linzhplinzhp
authored
Preparing 0.35 release (#3288)
1 parent d94e692 commit 5f81b37

11 files changed

+13455
-6620
lines changed

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module(
22
name = "rules_go",
33
repo_name = "io_bazel_rules_go",
4-
version = "0.34.0",
4+
version = "0.35.0",
55
compatibility_level = 0,
66
toolchains_to_register = [
77
"@go_default_sdk//:all",

‎go/def.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ TOOLS_NOGO = [
124124

125125
# Current version or next version to be tagged. Gazelle and other tools may
126126
# check this to determine compatibility.
127-
RULES_GO_VERSION = "0.34.0"
127+
RULES_GO_VERSION = "0.35.0"
128128

129129
declare_toolchains = _declare_toolchains
130130
go_context = _go_context

‎go/private/repositories.bzl‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ def go_rules_dependencies(force = False):
5050
wrapper(
5151
http_archive,
5252
name = "bazel_skylib",
53-
# 1.2.1, latest as of 2022-07-19
53+
# 1.3.0, latest as of 2022-09-10
5454
urls = [
55-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
56-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
55+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
56+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
5757
],
58-
sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
58+
sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
5959
strip_prefix = "",
6060
)
6161

@@ -64,13 +64,13 @@ def go_rules_dependencies(force = False):
6464
wrapper(
6565
http_archive,
6666
name = "org_golang_x_tools",
67-
# v0.1.11, latest as of 2022-07-19
67+
# v0.1.12, latest as of 2022-09-10
6868
urls = [
69-
"https://mirror.bazel.build/github.com/golang/tools/archive/refs/tags/v0.1.11.zip",
70-
"https://github.com/golang/tools/archive/refs/tags/v0.1.11.zip",
69+
"https://mirror.bazel.build/github.com/golang/tools/archive/refs/tags/v0.1.12.zip",
70+
"https://github.com/golang/tools/archive/refs/tags/v0.1.12.zip",
7171
],
72-
sha256 = "d31521bddf3380e4ae2ae1ce6dcfca301bce6072527a07d612e13902c93916ef",
73-
strip_prefix = "tools-0.1.11",
72+
sha256 = "4e3d94e7bf8dde5dad681c5ddddda6e634f8c8c500683fdf3d2f77a9c086702d",
73+
strip_prefix = "tools-0.1.12",
7474
patches = [
7575
# deletegopls removes the gopls subdirectory. It contains a nested
7676
# module with additional dependencies. It's not needed by rules_go.
@@ -86,13 +86,13 @@ def go_rules_dependencies(force = False):
8686
wrapper(
8787
http_archive,
8888
name = "org_golang_x_sys",
89-
# master, as of 2022-07-19
89+
# master, as of 2022-09-10
9090
urls = [
91-
"https://mirror.bazel.build/github.com/golang/sys/archive/c0bba94af5f85fbad9f6dc2e04ed5b8fac9696cf.zip",
92-
"https://github.com/golang/sys/archive/c0bba94af5f85fbad9f6dc2e04ed5b8fac9696cf.zip",
91+
"https://mirror.bazel.build/github.com/golang/sys/archive/aba9fc2a8ff2c9439446386f616b860442f0cf9a.zip",
92+
"https://github.com/golang/sys/archive/aba9fc2a8ff2c9439446386f616b860442f0cf9a.zip",
9393
],
94-
sha256 = "5ea378ea5cfc02089a4d6a2f405ce60b742f7a8e72b121ecd3582ab041c78f62",
95-
strip_prefix = "sys-c0bba94af5f85fbad9f6dc2e04ed5b8fac9696cf",
94+
sha256 = "ed02417470528e20fca4c422043984e565c4d8acaa0cb946408125f676acb1ea",
95+
strip_prefix = "sys-aba9fc2a8ff2c9439446386f616b860442f0cf9a",
9696
patches = [
9797
# releaser:patch-cmd gazelle -repo_root . -go_prefix golang.org/x/sys -go_naming_convention import_alias
9898
Label("//third_party:org_golang_x_sys-gazelle.patch"),
@@ -105,13 +105,13 @@ def go_rules_dependencies(force = False):
105105
wrapper(
106106
http_archive,
107107
name = "org_golang_x_xerrors",
108-
# master, as of 2022-07-19
108+
# master, as of 2022-09-10
109109
urls = [
110-
"https://mirror.bazel.build/github.com/golang/xerrors/archive/65e65417b02f28de84b55f16b46a1e789149973a.zip",
111-
"https://github.com/golang/xerrors/archive/65e65417b02f28de84b55f16b46a1e789149973a.zip",
110+
"https://mirror.bazel.build/github.com/golang/xerrors/archive/04be3eba64a22a838cdb17b8dca15a52871c08b4.zip",
111+
"https://github.com/golang/xerrors/archive/04be3eba64a22a838cdb17b8dca15a52871c08b4.zip",
112112
],
113-
sha256 = "85290a166d6cb22eef650634c3674663cd0d35b419b23372eba9aba6bde4878d",
114-
strip_prefix = "xerrors-65e65417b02f28de84b55f16b46a1e789149973a",
113+
sha256 = "ffad2b06ef2e09d040da2ff08077865e99ab95d4d0451737fc8e33706bb01634",
114+
strip_prefix = "xerrors-04be3eba64a22a838cdb17b8dca15a52871c08b4",
115115
patches = [
116116
# releaser:patch-cmd gazelle -repo_root . -go_prefix golang.org/x/xerrors -go_naming_convention import_alias
117117
Label("//third_party:org_golang_x_xerrors-gazelle.patch"),
@@ -140,13 +140,13 @@ def go_rules_dependencies(force = False):
140140
wrapper(
141141
http_archive,
142142
name = "org_golang_google_protobuf",
143-
sha256 = "dc4339bd2011a230d81d5ec445361efeb78366f1d30a7757e8fbea3e7221080e",
144-
# v1.28.0, latest as of 2022-07-19
143+
sha256 = "cbaac40c1faf6a3647316d46ec9c614e99aa92c539a78b7c1e4dec3ff5f73694",
144+
# v1.28.1, latest as of 2022-09-10
145145
urls = [
146-
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.28.0.zip",
147-
"https://github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.28.0.zip",
146+
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.28.1.zip",
147+
"https://github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.28.1.zip",
148148
],
149-
strip_prefix = "protobuf-go-1.28.0",
149+
strip_prefix = "protobuf-go-1.28.1",
150150
patches = [
151151
# releaser:patch-cmd gazelle -repo_root . -go_prefix google.golang.org/protobuf -go_naming_convention import_alias -proto disable_global
152152
Label("//third_party:org_golang_google_protobuf-gazelle.patch"),
@@ -163,7 +163,7 @@ def go_rules_dependencies(force = False):
163163
wrapper(
164164
http_archive,
165165
name = "com_github_golang_protobuf",
166-
# v1.5.2, latest as of 2022-07-19
166+
# v1.5.2, latest as of 2022-09-10
167167
urls = [
168168
"https://mirror.bazel.build/github.com/golang/protobuf/archive/refs/tags/v1.5.2.zip",
169169
"https://github.com/golang/protobuf/archive/refs/tags/v1.5.2.zip",
@@ -183,7 +183,7 @@ def go_rules_dependencies(force = False):
183183
wrapper(
184184
http_archive,
185185
name = "com_github_mwitkow_go_proto_validators",
186-
# v0.3.2, latest as of 2022-07-19
186+
# v0.3.2, latest as of 2022-09-10
187187
urls = [
188188
"https://mirror.bazel.build/github.com/mwitkow/go-proto-validators/archive/refs/tags/v0.3.2.zip",
189189
"https://github.com/mwitkow/go-proto-validators/archive/refs/tags/v0.3.2.zip",
@@ -197,7 +197,7 @@ def go_rules_dependencies(force = False):
197197
wrapper(
198198
http_archive,
199199
name = "com_github_gogo_protobuf",
200-
# v1.3.2, latest as of 2022-07-19
200+
# v1.3.2, latest as of 2022-09-10
201201
urls = [
202202
"https://mirror.bazel.build/github.com/gogo/protobuf/archive/refs/tags/v1.3.2.zip",
203203
"https://github.com/gogo/protobuf/archive/refs/tags/v1.3.2.zip",
@@ -224,13 +224,13 @@ def go_rules_dependencies(force = False):
224224
wrapper(
225225
http_archive,
226226
name = "org_golang_google_genproto",
227-
# main, as of 2022-07-19
227+
# main, as of 2022-09-10
228228
urls = [
229-
"https://mirror.bazel.build/github.com/googleapis/go-genproto/archive/073382fd740c33f92de4ffff0e52bfc802774231.zip",
230-
"https://github.com/googleapis/go-genproto/archive/073382fd740c33f92de4ffff0e52bfc802774231.zip",
229+
"https://mirror.bazel.build/github.com/googleapis/go-genproto/archive/69f6226f97e558dbaa68715071622af0d86b3a17.zip",
230+
"https://github.com/googleapis/go-genproto/archive/69f6226f97e558dbaa68715071622af0d86b3a17.zip",
231231
],
232-
sha256 = "07abd3383bedc19cd8e8931f99b3b6c312dc383de795c079e0ec6c63fa32ff39",
233-
strip_prefix = "go-genproto-073382fd740c33f92de4ffff0e52bfc802774231",
232+
sha256 = "0d47b1ae576fffd1280538ba0b2bca5d08d6dc8df9b2a41e0ce096e37d73e2c9",
233+
strip_prefix = "go-genproto-69f6226f97e558dbaa68715071622af0d86b3a17",
234234
patches = [
235235
# releaser:patch-cmd gazelle -repo_root . -go_prefix google.golang.org/genproto -go_naming_convention import_alias -proto disable_global
236236
Label("//third_party:org_golang_google_genproto-gazelle.patch"),
@@ -247,13 +247,13 @@ def go_rules_dependencies(force = False):
247247
wrapper(
248248
http_archive,
249249
name = "go_googleapis",
250-
# master, as of 2022-07-19
250+
# master, as of 2022-09-10
251251
urls = [
252-
"https://mirror.bazel.build/github.com/googleapis/googleapis/archive/53377c165584e84c410a0905d9effb3fe5df2806.zip",
253-
"https://github.com/googleapis/googleapis/archive/53377c165584e84c410a0905d9effb3fe5df2806.zip",
252+
"https://mirror.bazel.build/github.com/googleapis/googleapis/archive/8167badf3ce86086c69db2942a8995bb2de56c51.zip",
253+
"https://github.com/googleapis/googleapis/archive/8167badf3ce86086c69db2942a8995bb2de56c51.zip",
254254
],
255-
sha256 = "73831cbb41f2750f3181d126bbabcd3e58b5188e131ecbc309793fa54d5439c9",
256-
strip_prefix = "googleapis-53377c165584e84c410a0905d9effb3fe5df2806",
255+
sha256 = "b97d75f1c937ed2235c501fafc475f51a3280d26f9410831686fdfd1b4f612f9",
256+
strip_prefix = "googleapis-8167badf3ce86086c69db2942a8995bb2de56c51",
257257
patches = [
258258
# releaser:patch-cmd find . -name BUILD.bazel -delete
259259
Label("//third_party:go_googleapis-deletebuild.patch"),
@@ -269,18 +269,18 @@ def go_rules_dependencies(force = False):
269269
_maybe(
270270
http_archive,
271271
name = "com_github_golang_mock",
272-
# v1.6.0, latest as of 2022-07-19
272+
# v1.7.0-rc.1, latest as of 2022-09-10
273273
urls = [
274-
"https://mirror.bazel.build/github.com/golang/mock/archive/refs/tags/v1.6.0.zip",
275-
"https://github.com/golang/mock/archive/refs/tags/v1.6.0.zip",
274+
"https://mirror.bazel.build/github.com/golang/mock/archive/refs/tags/v1.7.0-rc.1.zip",
275+
"https://github.com/golang/mock/archive/refs/tags/v1.7.0-rc.1.zip",
276276
],
277277
patches = [
278278
# releaser:patch-cmd gazelle -repo_root . -go_prefix github.com/golang/mock -go_naming_convention import_alias
279279
Label("//third_party:com_github_golang_mock-gazelle.patch"),
280280
],
281281
patch_args = ["-p1"],
282-
sha256 = "604d9ab25b07d60c1b8ba6d3ea2e66873138edeed2e561c5358de804ea421a0e",
283-
strip_prefix = "mock-1.6.0",
282+
sha256 = "5359c78b0c1649cf7beb3b48ff8b1d1aaf0243b22ea4789aba94805280075d8e",
283+
strip_prefix = "mock-1.7.0-rc.1",
284284
)
285285

286286
# This may be overridden by go_register_toolchains, but it's not mandatory

‎third_party/com_github_golang_mock-gazelle.patch‎

Lines changed: 70 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -urN a/gomock/BUILD.bazel b/gomock/BUILD.bazel
22
--- a/gomock/BUILD.bazel 1969-12-31 16:00:00.000000000 -0800
33
+++ b/gomock/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000
4-
@@ -0,0 +1,35 @@
4+
@@ -0,0 +1,34 @@
55
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
66
+
77
+go_library(
@@ -10,6 +10,7 @@ diff -urN a/gomock/BUILD.bazel b/gomock/BUILD.bazel
1010
+ "call.go",
1111
+ "callset.go",
1212
+ "controller.go",
13+
+ "doc.go",
1314
+ "matchers.go",
1415
+ ],
1516
+ importpath = "github.com/golang/mock/gomock",
@@ -27,8 +28,6 @@ diff -urN a/gomock/BUILD.bazel b/gomock/BUILD.bazel
2728
+ srcs = [
2829
+ "call_test.go",
2930
+ "callset_test.go",
30-
+ "controller_113_test.go",
31-
+ "controller_114_test.go",
3231
+ "controller_test.go",
3332
+ "example_test.go",
3433
+ "matchers_test.go",
@@ -59,17 +58,18 @@ diff -urN a/gomock/internal/mock_gomock/BUILD.bazel b/gomock/internal/mock_gomoc
5958
diff -urN a/mockgen/BUILD.bazel b/mockgen/BUILD.bazel
6059
--- a/mockgen/BUILD.bazel 1969-12-31 16:00:00.000000000 -0800
6160
+++ b/mockgen/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000
62-
@@ -0,0 +1,35 @@
61+
@@ -0,0 +1,36 @@
6362
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
6463
+
6564
+go_library(
6665
+ name = "mockgen_lib",
6766
+ srcs = [
67+
+ "generic_go118.go",
68+
+ "generic_notgo118.go",
6869
+ "mockgen.go",
6970
+ "parse.go",
7071
+ "reflect.go",
71-
+ "version.1.11.go",
72-
+ "version.1.12.go",
72+
+ "version.go",
7373
+ ],
7474
+ importpath = "github.com/golang/mock/mockgen",
7575
+ visibility = ["//visibility:private"],
@@ -355,17 +355,80 @@ diff -urN a/mockgen/internal/tests/generated_identifier_conflict/BUILD.bazel b/m
355355
+ embed = [":generated_identifier_conflict"],
356356
+ deps = ["//gomock"],
357357
+)
358+
diff -urN a/mockgen/internal/tests/generics/BUILD.bazel b/mockgen/internal/tests/generics/BUILD.bazel
359+
--- a/mockgen/internal/tests/generics/BUILD.bazel 1969-12-31 16:00:00.000000000 -0800
360+
+++ b/mockgen/internal/tests/generics/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000
361+
@@ -0,0 +1,21 @@
362+
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
363+
+
364+
+go_library(
365+
+ name = "generics",
366+
+ srcs = [
367+
+ "external.go",
368+
+ "generics.go",
369+
+ ],
370+
+ importpath = "github.com/golang/mock/mockgen/internal/tests/generics",
371+
+ visibility = ["//mockgen:__subpackages__"],
372+
+ deps = [
373+
+ "//mockgen/internal/tests/generics/other",
374+
+ "@org_golang_x_exp//constraints:go_default_library",
375+
+ ],
376+
+)
377+
+
378+
+alias(
379+
+ name = "go_default_library",
380+
+ actual = ":generics",
381+
+ visibility = ["//mockgen:__subpackages__"],
382+
+)
383+
diff -urN a/mockgen/internal/tests/generics/other/BUILD.bazel b/mockgen/internal/tests/generics/other/BUILD.bazel
384+
--- a/mockgen/internal/tests/generics/other/BUILD.bazel 1969-12-31 16:00:00.000000000 -0800
385+
+++ b/mockgen/internal/tests/generics/other/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000
386+
@@ -0,0 +1,14 @@
387+
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
388+
+
389+
+go_library(
390+
+ name = "other",
391+
+ srcs = ["other.go"],
392+
+ importpath = "github.com/golang/mock/mockgen/internal/tests/generics/other",
393+
+ visibility = ["//mockgen:__subpackages__"],
394+
+)
395+
+
396+
+alias(
397+
+ name = "go_default_library",
398+
+ actual = ":other",
399+
+ visibility = ["//mockgen:__subpackages__"],
400+
+)
401+
diff -urN a/mockgen/internal/tests/generics/source/BUILD.bazel b/mockgen/internal/tests/generics/source/BUILD.bazel
402+
--- a/mockgen/internal/tests/generics/source/BUILD.bazel 1969-12-31 16:00:00.000000000 -0800
403+
+++ b/mockgen/internal/tests/generics/source/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000
404+
@@ -0,0 +1,15 @@
405+
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
406+
+
407+
+go_test(
408+
+ name = "source_test",
409+
+ srcs = [
410+
+ "mock_external_test.go",
411+
+ "mock_generics_test.go",
412+
+ ],
413+
+ deps = [
414+
+ "//gomock",
415+
+ "//mockgen/internal/tests/generics",
416+
+ "//mockgen/internal/tests/generics/other",
417+
+ "@org_golang_x_exp//constraints:go_default_library",
418+
+ ],
419+
+)
358420
diff -urN a/mockgen/internal/tests/import_embedded_interface/BUILD.bazel b/mockgen/internal/tests/import_embedded_interface/BUILD.bazel
359421
--- a/mockgen/internal/tests/import_embedded_interface/BUILD.bazel 1969-12-31 16:00:00.000000000 -0800
360422
+++ b/mockgen/internal/tests/import_embedded_interface/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000
361-
@@ -0,0 +1,35 @@
423+
@@ -0,0 +1,36 @@
362424
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
363425
+
364426
+go_library(
365427
+ name = "import_embedded_interface",
366428
+ srcs = [
367429
+ "bugreport.go",
368430
+ "bugreport_mock.go",
431+
+ "foo.go",
369432
+ "net.go",
370433
+ "net_mock.go",
371434
+ ],

0 commit comments

Comments
 (0)