From a35b0c48dfef65d70d7c6c598c28d3171790f525 Mon Sep 17 00:00:00 2001 From: Mike Splain Date: Fri, 20 Jul 2018 13:50:08 -0400 Subject: [PATCH] Update rules go and gazelle --- BUILD.bazel | 8 +++++--- Gopkg.lock | 14 +++++++++----- Gopkg.toml | 2 +- WORKSPACE | 8 ++++---- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index bf14a891d9..18c94cb899 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,8 +1,10 @@ +# gazelle:prefix k8s.io/kops + +load("@bazel_gazelle//:def.bzl", "gazelle") + package(default_visibility = ["//visibility:public"]) -load("@io_bazel_rules_go//go:def.bzl", "gazelle", "go_library", "go_prefix") - -go_prefix("k8s.io/kops") +load("@io_bazel_rules_go//go:def.bzl", "go_library") gazelle( name = "gazelle", diff --git a/Gopkg.lock b/Gopkg.lock index e5199f1618..e020f06e0c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -166,19 +166,23 @@ packages = [ "cmd/gazelle", "internal/config", - "internal/generator", + "internal/flag", "internal/label", + "internal/language", + "internal/language/go", + "internal/language/proto", "internal/merger", - "internal/packages", "internal/pathtools", "internal/repos", "internal/resolve", + "internal/rule", "internal/version", - "internal/wspace", + "internal/walk", + "internal/wspace" ] pruneopts = "UT" - revision = "7f30ba724af9495b221e2df0f5ac58511179485f" - version = "0.12.0" + revision = "b10e7beac17436852ab4e2249b94eb3c9c9f2ef1" + version = "0.13.0" [[projects]] digest = "1:331f668c3b6315145093a3b104c1da6be2835a3b1e7c873ad5fba82667330d44" diff --git a/Gopkg.toml b/Gopkg.toml index 1c7c1041c9..7c5dd15c79 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -31,7 +31,7 @@ required = [ [[override]] name = "github.com/bazelbuild/bazel-gazelle" - version = "0.12.0" + version = "0.13.0" # aws-sdk-go is one of our critical dependencies [[override]] diff --git a/WORKSPACE b/WORKSPACE index c6dc3524f8..893e45f8d4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,14 +3,14 @@ http_archive( name = "io_bazel_rules_go", - url = "https://github.com/bazelbuild/rules_go/releases/download/0.12.0/rules_go-0.12.0.tar.gz", - sha256 = "c1f52b8789218bb1542ed362c4f7de7052abcf254d865d96fb7ba6d44bc15ee3", + url = "https://github.com/bazelbuild/rules_go/releases/download/0.14.1/rules_go-0.14.1.tar.gz", + sha256 = "ee0e3b346388c447f13009d789c8bf2d7bae4643ac70bd7997ded0ad09b2fff7", ) http_archive( name = "bazel_gazelle", - url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.12.0/bazel-gazelle-0.12.0.tar.gz", - sha256 = "ddedc7aaeb61f2654d7d7d4fd7940052ea992ccdb031b8f9797ed143ac7e8d43", + url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz", + sha256 = "c0a5739d12c6d05b6c1ad56f2200cb0b57c5a70e03ebd2f7b87ce88cabf09c7b", ) load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")