Skip to content

Update protobuf dependency to 26+ by merging upstream changes to code generator. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: es6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0e9afb9
Use range-based for loops in the generator.
benjaminp Dec 13, 2022
6113588
Merge pull request #158 from benjaminp/range-based
dibenede Dec 14, 2022
c7a0b61
Bazel: bzlmod support (#10)
gonzojive Aug 3, 2024
5420c3d
bzlmod support
gonzojive Aug 3, 2024
8cc33e0
Merge remote-tracking branch 'origin/es6' into es6
gonzojive Aug 3, 2024
206dd81
Actually get bzlmod working.
gonzojive Aug 3, 2024
736b1a0
Add comment, lock update
gonzojive Aug 5, 2024
c7383c4
Remove WORKSPACE
gonzojive Aug 5, 2024
4a37a44
Merge remote-tracking branch 'origin/es6' into bzlmod2
gonzojive Aug 5, 2024
cd267e8
Update protobuf dependency to 26+ by merging upstream changes to gene…
gonzojive Aug 5, 2024
c040f0f
Merge remote-tracking branch 'origin/es6' into merge-upstream-changes
gonzojive Aug 5, 2024
6563a96
Update module version
gonzojive Aug 5, 2024
1648c4c
update MODULE.bazel.lock
gonzojive Sep 15, 2024
5c32f17
update MODULE.bazel.lock
gonzojive Sep 15, 2024
1907354
Merge remote-tracking branch 'origin/main' into merge-upstream-changes
gonzojive Sep 15, 2024
02dcb53
fix merge issue with precondition check
gonzojive Sep 15, 2024
e8395c2
fix errors due to merge in repeated fields, oneofs, utf8 validation
reddaly Sep 25, 2024
79f6be6
Add test script that uses local protoc
gonzojive Sep 26, 2024
c907ed0
Merge remote-tracking branch 'origin/merge-upstream-changes' into mer…
gonzojive Sep 26, 2024
df853e9
Add script for releasing to github.
gonzojive Sep 27, 2024
18ee277
Update release script
gonzojive Sep 27, 2024
5da7f5f
Update compatibility_level of module to 3
gonzojive Sep 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
# https://github.com/protocolbuffers/protobuf/issues/14313
common --enable_bzlmod
7 changes: 4 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
module(
name = "protobuf_javascript_gonzojive",
version = "3.21.5",
name = "protobuf_javascript_esm",
version = "3.21.5.esm",
compatibility_level = 3,
)

bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "27.1", repo_name = "com_google_protobuf")
bazel_dep(name = "abseil-cpp", version = "20211102.0")
bazel_dep(name = "rules_pkg", version = "0.7.0")

Expand Down
1,593 changes: 1,583 additions & 10 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,13 @@ idea of how the library generally works:

For more examples, see the tests. You can also look at the generated code
to see what methods are defined for your generated messages.


Releasing
===

The following script can be used to push a release to github:

```shell
go run tools/upload-release.go
```
2 changes: 2 additions & 0 deletions WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# When Bzlmod is enabled, this file replaces the content of the original WORKSPACE and
# makes sure no WORKSPACE prefix or suffix are added when Bzlmod is enabled.
5 changes: 5 additions & 0 deletions generator/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ cc_binary(
],
visibility = ["//visibility:public"],
deps = [
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:str_format",
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//:protoc_lib",
"@com_google_protobuf//src/google/protobuf/compiler:code_generator",
"@com_google_protobuf//src/google/protobuf/io",
"@com_google_protobuf//src/google/protobuf/io:printer",
"@com_google_protobuf//src/google/protobuf/io:tokenizer",
],
)
Loading
Loading