diff --git a/WORKSPACE b/WORKSPACE index b995910fc2141617d2425bf3862341df04775e29..84d23aa8925afa24ff8528085c82141ae3fa010a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -7,16 +7,6 @@ http_archive( url = "https://github.com/google/wycheproof/archive/f755ff0279ddd5fa26640d959d5872764b45feb7.zip", ) -# go packages -#----------------------------------------------------------------------------- -# go -#----------------------------------------------------------------------------- -http_archive( - name = "io_bazel_rules_go", - strip_prefix = "rules_go-master", - url = "https://github.com/bazelbuild/rules_go/archive/master.zip", -) - #----------------------------------------------------------------------------- # cc #----------------------------------------------------------------------------- @@ -514,13 +504,19 @@ http_archive( url = "https://github.com/bazelbuild/rules_apple/archive/a2b620070d373e4f265194b69f65e9e5c17fbcb8.zip", ) +#----------------------------------------------------------------------------- +# go +#----------------------------------------------------------------------------- +http_archive( + name = "io_bazel_rules_go", + url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.1/rules_go-0.10.1.tar.gz", + sha256 = "4b14d8dd31c6dbaf3ff871adcd03f28c3274e42abc855cb8fb4d01233c0154dc", +) + load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains") go_rules_dependencies() go_register_toolchains() -load("@io_bazel_rules_go//proto:def.bzl", "proto_register_toolchains") -proto_register_toolchains() - #----------------------------------------------------------------------------- # jarjar #----------------------------------------------------------------------------- diff --git a/maven/tink.pom.xml b/maven/tink.pom.xml index 32530ca08b9453776ae95bc06eec52ae54a2f90c..1359e48776e5a3a542e74378fb4f7d175f263d9d 100644 --- a/maven/tink.pom.xml +++ b/maven/tink.pom.xml @@ -68,7 +68,7 @@ <error-prone-annotations.version>2.0.19</error-prone-annotations.version> <google-api-client.version>1.22.0</google-api-client.version> <google-api-services-cloudkms.version>v1-rev9-1.22.0</google-api-services-cloudkms.version> - <google-auto-service.version>1.0-rc3</google-auto-service.version> + <google-auto-service.version>1.0-rc4</google-auto-service.version> <json.version>20170516</json.version> <protobuf.version>3.3.0</protobuf.version> <protobuf-lite.version>3.0.1</protobuf-lite.version> @@ -135,6 +135,12 @@ <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> <version>${google-auto-service.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>