Sync protobuf dependencies in the Bazel workspace and the Maven project definitions.
PiperOrigin-RevId: 284693335
diff --git a/WORKSPACE b/WORKSPACE
index fc56c16..1d3d36f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -106,24 +106,6 @@
grpc = True,
)
-# gRPC.
-# Release from 2019-08-15
-http_archive(
- name = "com_github_grpc_grpc",
- urls = [
- "https://github.com/grpc/grpc/archive/v1.22.1.tar.gz",
- ],
- sha256 = "cce1d4585dd017980d4a407d8c5e9f8fc8c1dbb03f249b99e88a387ebb45a035",
- strip_prefix = "grpc-1.22.1",
-)
-
-# Load grpc_deps.
-# This is a workaround around the missing support for recursive WORKSPACE
-# file loading (https://github.com/bazelbuild/bazel/issues/1943).
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
# Release from 2016-05-30
http_archive(
name = "curl",
@@ -153,12 +135,12 @@
# on @com_google_protobuf//:proto, @com_google_protobuf//:cc_toolchain and
# @com_google_protobuf//:java_toolchain, respectively.
# This statement defines the @com_google_protobuf repo.
-# Release from 2019-08-05
+# Release from 2019-12-02
http_archive(
name = "com_google_protobuf",
- strip_prefix = "protobuf-3.9.1",
- urls = ["https://github.com/google/protobuf/archive/v3.9.1.zip"],
- sha256 = "c90d9e13564c0af85fd2912545ee47b57deded6e5a97de80395b6d2d9be64854",
+ strip_prefix = "protobuf-3.11.1",
+ urls = ["https://github.com/google/protobuf/archive/v3.11.1.zip"],
+ sha256 = "20e55e7dc9ebbb5800072fff25fd56d7c0a168493ef4652e78910566fa6b45f5",
)
# Load protobuf_deps.
@@ -171,14 +153,18 @@
# java_lite_proto_library rules implicitly depend on
# @com_google_protobuf_javalite//:javalite_toolchain, which is the JavaLite proto
# runtime (base classes and common utilities).
-# Commit from 2019-08-23 on the javalite branch.
+# Commit from 2019-12-03 on the 3.11.x branch.
http_archive(
name = "com_google_protobuf_javalite",
- strip_prefix = "protobuf-7b64714af67aa967dcf941df61fe5207975966be",
- urls = ["https://github.com/google/protobuf/archive/7b64714af67aa967dcf941df61fe5207975966be.zip"],
- sha256 = "311b29b8d0803ab4f89be22ff365266abb6c48fd3483d59b04772a144d7a24a1",
+ strip_prefix = "protobuf-0425fa932ce95a32bb9f88b2c09b995e9ff8207b",
+ urls = ["https://github.com/google/protobuf/archive/0425fa932ce95a32bb9f88b2c09b995e9ff8207b.zip"],
+ sha256 = "e60211a40473f6be95b53f64559f82a3b2971672b11710db2fc9081708e25699",
)
+load("@com_google_protobuf_javalite//:protobuf_deps.bzl", javalite_protobuf_deps = "protobuf_deps")
+
+javalite_protobuf_deps()
+
#-----------------------------------------------------------------------------
# java
#-----------------------------------------------------------------------------
@@ -638,6 +624,32 @@
)
#-----------------------------------------------------------------------------
+# gRPC
+#-----------------------------------------------------------------------------
+
+# Release from 2019-12-05
+# Using the pre-release version due to https://github.com/grpc/grpc/issues/20511
+http_archive(
+ name = "com_github_grpc_grpc",
+ urls = [
+ "https://github.com/grpc/grpc/archive/v1.26.0-pre1.tar.gz",
+ ],
+ sha256 = "d6af0859d3ae4693b1955e972aa2e590d6f4d44baaa82651467c6beea453e30e",
+ strip_prefix = "grpc-1.26.0-pre1",
+)
+
+# Load grpc_deps.
+# This is a workaround around the missing support for recursive WORKSPACE
+# file loading (https://github.com/bazelbuild/bazel/issues/1943).
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+
+grpc_deps()
+
+load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+
+grpc_extra_deps()
+
+#-----------------------------------------------------------------------------
# Remote Build Execution
#-----------------------------------------------------------------------------
# Latest 0.29 package for bazel 0.29.1; updated on 2019-10-31.
diff --git a/java/BUILD.bazel b/java/BUILD.bazel
index 5fa2b2e..9b3edb4 100644
--- a/java/BUILD.bazel
+++ b/java/BUILD.bazel
@@ -245,7 +245,7 @@
"//java/src/main/java/com/google/crypto/tink/testing:streaming_test_util",
"//java/src/main/java/com/google/crypto/tink/testing:test_util",
"//java/src/main/java/com/google/crypto/tink/testing:wycheproof_test_util",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@maven//:com_amazonaws_aws_java_sdk_core",
"@maven//:com_amazonaws_aws_java_sdk_kms",
"@maven//:com_google_api_client_google_api_client",
diff --git a/java/src/main/java/com/google/crypto/tink/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/BUILD.bazel
index 76f1009..b7977dd 100644
--- a/java/src/main/java/com/google/crypto/tink/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/BUILD.bazel
@@ -111,7 +111,7 @@
"//java/src/main/java/com/google/crypto/tink/subtle",
":primitives",
"@com_google_code_findbugs_jsr305",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@org_json",
],
)
@@ -134,7 +134,7 @@
javacopts = JAVACOPTS_OSS,
deps = full_protos + [
":tink",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -146,7 +146,7 @@
javacopts = JAVACOPTS_OSS,
deps = lite_protos + [
":android",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -157,7 +157,7 @@
deps = [
":core",
"//proto:tink_java_proto",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -168,6 +168,6 @@
deps = [
":core-android",
"//proto:tink_java_proto_lite",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/aead/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/aead/BUILD.bazel
index 5424b31..f14b2cb 100644
--- a/java/src/main/java/com/google/crypto/tink/aead/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/aead/BUILD.bazel
@@ -56,7 +56,7 @@
"//java/src/main/java/com/google/crypto/tink/mac",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:aead",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -71,6 +71,6 @@
"//java/src/main/java/com/google/crypto/tink/mac:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:aead",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/daead/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/daead/BUILD.bazel
index 1cbc9e3..48a3be0 100644
--- a/java/src/main/java/com/google/crypto/tink/daead/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/daead/BUILD.bazel
@@ -36,7 +36,7 @@
"//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:daead",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -49,6 +49,6 @@
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:daead",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/hybrid/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/hybrid/BUILD.bazel
index 275730e..43f332b 100644
--- a/java/src/main/java/com/google/crypto/tink/hybrid/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/hybrid/BUILD.bazel
@@ -50,7 +50,7 @@
"//java/src/main/java/com/google/crypto/tink/mac",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:hybrid",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -67,6 +67,6 @@
"//java/src/main/java/com/google/crypto/tink/mac:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:hybrid",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/integration/android/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/integration/android/BUILD.bazel
index bccf943..deaa101 100644
--- a/java/src/main/java/com/google/crypto/tink/integration/android/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/integration/android/BUILD.bazel
@@ -38,6 +38,6 @@
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:aead",
"@com_google_code_findbugs_jsr305",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/mac/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/mac/BUILD.bazel
index 9477780..596dd52 100644
--- a/java/src/main/java/com/google/crypto/tink/mac/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/mac/BUILD.bazel
@@ -38,7 +38,7 @@
"//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:mac",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -51,6 +51,6 @@
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:mac",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/prf/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/prf/BUILD.bazel
index 426e6f9..6f83d30 100644
--- a/java/src/main/java/com/google/crypto/tink/prf/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/prf/BUILD.bazel
@@ -16,7 +16,7 @@
"//proto:common_java_proto",
"//proto:hkdf_prf_java_proto",
"//proto:tink_java_proto",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -51,7 +51,7 @@
"//proto:common_java_proto_lite",
"//proto:hkdf_prf_java_proto_lite",
"//proto:tink_java_proto_lite",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/signature/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/signature/BUILD.bazel
index 169ec07..0033398 100644
--- a/java/src/main/java/com/google/crypto/tink/signature/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/signature/BUILD.bazel
@@ -45,7 +45,7 @@
"//java/src/main/java/com/google/crypto/tink/annotations",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:signature",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
@@ -59,6 +59,6 @@
"//java/src/main/java/com/google/crypto/tink/annotations",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:signature",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/streamingaead/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/streamingaead/BUILD.bazel
index 3394dbf..be429fd 100644
--- a/java/src/main/java/com/google/crypto/tink/streamingaead/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/streamingaead/BUILD.bazel
@@ -40,7 +40,7 @@
"//java/src/main/java/com/google/crypto/tink",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:streaming",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@com_google_code_findbugs_jsr305",
],
)
@@ -54,7 +54,7 @@
"//java/src/main/java/com/google/crypto/tink:android",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//java/src/main/java/com/google/crypto/tink/subtle:streaming",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@com_google_code_findbugs_jsr305",
],
)
diff --git a/java/src/main/java/com/google/crypto/tink/testing/BUILD.bazel b/java/src/main/java/com/google/crypto/tink/testing/BUILD.bazel
index d435a9b..4bc3e62 100644
--- a/java/src/main/java/com/google/crypto/tink/testing/BUILD.bazel
+++ b/java/src/main/java/com/google/crypto/tink/testing/BUILD.bazel
@@ -36,7 +36,7 @@
"//proto:rsa_ssa_pkcs1_java_proto",
"//proto:rsa_ssa_pss_java_proto",
"//proto:tink_java_proto",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
],
@@ -71,7 +71,7 @@
"//proto:rsa_ssa_pkcs1_java_proto_lite",
"//proto:rsa_ssa_pss_java_proto_lite",
"//proto:tink_java_proto_lite",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
],
diff --git a/maven/tink-android.pom.xml b/maven/tink-android.pom.xml
index 418d8a8..65be595 100644
--- a/maven/tink-android.pom.xml
+++ b/maven/tink-android.pom.xml
@@ -65,7 +65,7 @@
<java.version>1.7</java.version>
<!-- library versions -->
- <protobuf-javalite.version>3.10.0</protobuf-javalite.version>
+ <protobuf-javalite.version>3.11.1</protobuf-javalite.version>
</properties>
<dependencies>
diff --git a/maven/tink.pom.xml b/maven/tink.pom.xml
index 06064ff..4872218 100644
--- a/maven/tink.pom.xml
+++ b/maven/tink.pom.xml
@@ -65,7 +65,7 @@
<java.version>1.7</java.version>
<json.version>20180813</json.version>
- <protobuf.version>3.10.0</protobuf.version>
+ <protobuf.version>3.11.1</protobuf.version>
</properties>
<dependencies>
diff --git a/tools/tinkey/BUILD.bazel b/tools/tinkey/BUILD.bazel
index c2cc963..8695d51 100644
--- a/tools/tinkey/BUILD.bazel
+++ b/tools/tinkey/BUILD.bazel
@@ -30,7 +30,7 @@
"//java/src/main/java/com/google/crypto/tink/streamingaead",
"//java/src/main/java/com/google/crypto/tink/subtle",
"//proto:tink_java_proto",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@maven//:args4j_args4j",
],
)
@@ -64,7 +64,7 @@
":libtinkey",
"//java:testonly",
"//java:testutil",
- "@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@com_google_protobuf_javalite//:protobuf_javalite",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
],
