Skip to content
This repository has been archived by the owner on Mar 4, 2022. It is now read-only.

Update default version of protoc to 3.7.1 #417

Merged
merged 2 commits into from
Apr 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
- Add linters for enum field and message field comments. These linters are not
part of any lint group but can be manually added in a configuration file.
- Update the default version of `protoc` to `3.7.1`.


## [1.4.0] - 2019-03-19
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Recommended base config file:

```yaml
protoc:
version: 3.7.0
version: 3.7.1
lint:
group: uber2
```
Expand Down
8 changes: 7 additions & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ Before submitting a PR, make sure to:
The entire implementation is purposefully under the `internal` package to not expose any API for
the time being.

For maintainers: See [release.md](release.md) for the release process.
## Maintainers

See [release.md](release.md) for the release process.

See https://github.com/uber/prototool/pull/417 for an example of how to update the default version
of `protoc`. Note that `etc/config/example/prototool.yaml` is automatically updated once you
update `DefaultProtocVersion` in `internal/vars/vars.go` and you run `make generate`.
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ prototool cache update
# Cache to a specific directory path/to/cache
prototool cache update --cache-path path/to/cache
# Cache using custom configuration data instead of finding a prototool.yaml file using the file discovery mechanism
prototool cache update --config-data '{"protoc":{"version":"3.7.0"}}'
prototool cache update --config-data '{"protoc":{"version":"3.7.1"}}'
```

There is also a command `prototool cache delete` which will delete all cached assets of
Expand Down
4 changes: 2 additions & 2 deletions docs/protoc.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ for more details.
- Otherwise, if on Linux, `$HOME/.cache/prototool` will be used, or on Darwin,
`$HOME/Library/Caches/prototool` will be used.

By default, `protoc` version `3.7.0` is downloaded, however this is configurable in your
By default, `protoc` version `3.7.1` is downloaded, however this is configurable in your
`prototool.yaml` file.

```yaml
protoc:
version: 3.7.0
version: 3.7.1
```

Downloads are safe to run concurrently across processes, for example if using from Bazel, as
Expand Down
4 changes: 2 additions & 2 deletions etc/config/example/prototool.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ excludes:
# Protoc directives.
protoc:
# The Protobuf version to use from https://github.com/protocolbuffers/protobuf/releases.
# By default use 3.7.0.
# By default use 3.7.1.
# You probably want to set this to make your builds completely reproducible.
version: 3.7.0
version: 3.7.1

# Additional paths to include with -I to protoc.
# By default, the directory of the config file is included,
Expand Down
2 changes: 1 addition & 1 deletion example/proto/prototool.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
protoc:
version: 3.7.0
version: 3.7.1
lint:
group: uber2
rules:
Expand Down
2 changes: 1 addition & 1 deletion internal/reflect/proto/prototool.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
protoc:
version: 3.7.0
version: 3.7.1
lint:
group: uber2
generate:
Expand Down
2 changes: 1 addition & 1 deletion internal/vars/vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ const (
// github.com/protocolbuffers/protobuf to use.
//
// See https://github.com/protocolbuffers/protobuf/releases for the latest release.
DefaultProtocVersion = "3.7.0"
DefaultProtocVersion = "3.7.1"
)