Merge branch 'dev'

Author: Steve Ayers

.gitignore

@@ -2,6 +2,7 @@
 /.idea
 /.tmp
 /.vscode
+/prototool
 /bazel-*
 /brew
 /etc/docker/testing/gen

CHANGELOG.md

@@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.9.0] - 2019-10-12
+## [Unreleased]
 - No changes yet.
 
 
+## [1.9.0] - 2019-10-12
+- Updated dependencies for Go 1.13
+
+
 ## [1.8.0] - 2019-06-10
 - Update the default `protoc` version to `3.8.0`.
 - Parse updated `protoc` output for `3.8.0`.
@@ -248,6 +252,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release.
 
+[Unreleased]: https://github.com/uber/prototool/compare/v1.9.0...HEAD
 [1.9.0]: https://github.com/uber/prototool/compare/v1.8.0...v1.9.0
 [1.8.0]: https://github.com/uber/prototool/compare/v1.7.0...v1.8.0
 [1.7.0]: https://github.com/uber/prototool/compare/v1.6.0...v1.7.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.12.4-alpine3.9 as builder
+FROM golang:1.14-alpine3.11 as builder
 
 RUN apk add --update --no-cache build-base curl git upx && \
   rm -rf /var/cache/apk/*
@@ -67,17 +67,17 @@ RUN cd /tmp/prototool && \
 
 RUN upx --lzma /usr/local/bin/*
 
-FROM alpine:edge
+FROM alpine:latest
 
 WORKDIR /work
 
 ENV \
   PROTOTOOL_PROTOC_BIN_PATH=/usr/bin/protoc \
   PROTOTOOL_PROTOC_WKT_PATH=/usr/include \
-  GRPC_VERSION=1.21.3 \
-  PROTOBUF_VERSION=3.8.0 \
-  ALPINE_GRPC_VERSION_SUFFIX=r0 \
-  ALPINE_PROTOBUF_VERSION_SUFFIX=r0
+  GRPC_VERSION=1.25.0 \
+  PROTOBUF_VERSION=3.11.2 \
+  ALPINE_GRPC_VERSION_SUFFIX=r1 \
+  ALPINE_PROTOBUF_VERSION_SUFFIX=r1
 
 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
   apk add --update --no-cache bash curl git grpc=${GRPC_VERSION}-${ALPINE_GRPC_VERSION_SUFFIX} protobuf=${PROTOBUF_VERSION}-${ALPINE_PROTOBUF_VERSION_SUFFIX} && \

Makefile

@@ -31,7 +31,7 @@ env:
 	@echo 'export PATH="$(GOBIN):$${PATH}"' >> $(TMP)/env
 	@echo $(TMP)/env
 
-BAZEL_VERSION := 0.24.1
+BAZEL_VERSION := 1.2.0
 BAZEL := $(TMP_VERSIONS)/bazel/$(BAZEL_VERSION)
 ifeq ($(UNAME_OS),Darwin)
 BAZEL_OS := darwin
@@ -112,6 +112,10 @@ all: lint cover bazeltest bazelbuild
 install:
 	go install ./cmd/prototool
 
+.PHONy: bins
+bins:
+	go build ./cmd/prototool
+
 .PHONY: license
 license: __eval_srcs $(UPDATE_LICENSE)
 	update-license $(SRCS)

WORKSPACE

@@ -3,22 +3,48 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "io_bazel_rules_go",
-    urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.3/rules_go-0.18.3.tar.gz"],
-    sha256 = "86ae934bd4c43b99893fc64be9d9fc684b81461581df7ea8fc291c816f5ee8c5",
-)
-
-git_repository(
-    name = "bazel_gazelle",
-    remote = "https://github.com/bazelbuild/bazel-gazelle.git",
-    commit = "63ddd72aa315d020456f1a96bc6fcca9405810cb",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
+    ],
+    sha256 = "e6a6c016b0663e06fa5fccf1cd8152eab8aa8180c583ec20c872f4f9953a7ac5",
 )
 
 load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
+
 go_rules_dependencies()
+
 go_register_toolchains()
 
+http_archive(
+    name = "bazel_gazelle",
+    urls = [
+        "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
+    ],
+    sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
+)
+
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+
 gazelle_dependencies()
 
+git_repository(
+    name = "com_google_protobuf",
+    commit = "d0bfd5221182da1a7cc280f3337b5e41a89539cf",
+    remote = "https://github.com/protocolbuffers/protobuf",
+    shallow_since = "1581711200 -0800"
+)
+
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 load("//bazel:deps.bzl", "prototool_deps")
+
+prototool_deps()
+
+load("//bazel:deps.bzl", "prototool_deps")
+
+# gazelle:repository_macro bazel/deps.bzl%prototool_deps
 prototool_deps()