From d9c06285ccaa3e2d4471915f0b55a63b12f83ba2 Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Wed, 11 Jul 2018 09:31:05 +0200 Subject: [PATCH] Use grpc-gateway fork for code generation. This fork uses the correct JSON names as specified by the Protobuf to JSON mapping (https://developers.google.com/protocol-buffers/docs/proto3#json). This is needed until https://github.com/grpc-ecosystem/grpc-gateway/pull/681 has been merged. --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 87108b8f7..ab046f57c 100644 --- a/Makefile +++ b/Makefile @@ -62,19 +62,19 @@ static/swagger/api.swagger.json: # shortcuts for development requirements: - @echo "Installing development tools" - @go get -u github.com/golang/lint/golint - @go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway - @go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger - @go get -u github.com/golang/protobuf/protoc-gen-go - @go get -u github.com/elazarl/go-bindata-assetfs/... - @go get -u github.com/jteeuwen/go-bindata/... - @go get -u github.com/kisielk/errcheck - @go get -u github.com/smartystreets/goconvey - @go get -u golang.org/x/tools/cmd/stringer - @go get -u github.com/golang/dep/cmd/dep - @go get -u github.com/goreleaser/goreleaser - @dep ensure -v + echo "Installing development tools" + go get -u github.com/golang/lint/golint + go get -u github.com/brocaar/grpc-gateway/protoc-gen-grpc-gateway + go get -u github.com/brocaar/grpc-gateway/protoc-gen-swagger + go get -u github.com/golang/protobuf/protoc-gen-go + go get -u github.com/elazarl/go-bindata-assetfs/... + go get -u github.com/jteeuwen/go-bindata/... + go get -u github.com/kisielk/errcheck + go get -u github.com/smartystreets/goconvey + go get -u golang.org/x/tools/cmd/stringer + go get -u github.com/golang/dep/cmd/dep + go get -u github.com/goreleaser/goreleaser + dep ensure -v ui-requirements: @echo "Installing UI requirements"