Skip to content
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

version bumps (protoc 3.18.0) #297

Merged
merged 7 commits into from
Sep 28, 2021
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
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: bufbuild/buf-setup-action@v0.4.0
- uses: bufbuild/buf-setup-action@v0.5.0

- uses: bufbuild/buf-lint-action@v0.3.0
- uses: bufbuild/buf-lint-action@v1.0.0

- uses: bufbuild/buf-breaking-action@v0.4.0
- uses: bufbuild/buf-breaking-action@v1.0.0
if: always()
with:
against: "https://github.com/stroeer/tapir.git#branch=master"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LANGUAGE ?= java
GRPCPLUGIN ?= /usr/bin/protoc-gen-grpc-$(LANGUAGE)

PROTO_FILES := $(shell find stroeer -iname "*.proto" | sed "s/proto$$/$(TARGET_SUFFIX)/")
PROTOC_VERSION ?= 3.17.3
PROTOC_VERSION ?= 3.18.0
PROTOC ?= docker run --rm --volume $(DIR):$(DIR) --workdir $(DIR) ghcr.io/stroeer/protoc-dockerized:$(PROTOC_VERSION)

FLAGS += --proto_path=$(DIR)
Expand Down
4 changes: 4 additions & 0 deletions java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@ configurations {

dependencies {
def grpc = '1.40.1'
def protoc = '3.18.0'

implementation group: 'io.grpc', name: 'grpc-services', version: grpc
implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'

implementation group: 'com.google.protobuf', name: 'protobuf-java', version: protoc
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: protoc

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.8.0'

genGrpc group: 'io.grpc', name: 'protoc-gen-grpc-java', version: grpc, classifier: 'linux-x86_64', ext: 'exe'
Expand Down
6 changes: 3 additions & 3 deletions node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@types/google-protobuf": "3.15.5",
"@grpc/grpc-js": "1.3.7",
"google-protobuf": "3.17.3"
"google-protobuf": "3.18.0"
},
"devDependencies": {
"@types/jest": "27.0.1",
Expand Down