From ddb360d645bc3a16c183dea8715751fc4362c8a7 Mon Sep 17 00:00:00 2001 From: Elliotte Harold Date: Thu, 31 Jan 2019 13:08:52 -0500 Subject: [PATCH 1/2] remove obsolete truth workaround --- testing/build.gradle | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/testing/build.gradle b/testing/build.gradle index 4a4805e77e2..28cbbd677dd 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -4,17 +4,11 @@ dependencies { compile project(':grpc-core'), project(':grpc-stub'), libraries.junit + libraries.truth compile (libraries.mockito) { // prefer 1.3 from JUnit instead of 1.1 exclude group: 'org.hamcrest', module: 'hamcrest-core' } - // Use compileOnly to avoid dependencyConvergence problem with the Guava - // pulled in via Truth, for users that don't use Truth. Truth requires a - // more up-to-date Guava than we support elsewhere, which would trigger - // convergence failures in tests that only our users could resolve. Using - // compileOnly means only users using Truth would have the problem and - // they'd have to resolve it like normal anyway. - compileOnly libraries.truth testCompile project(':grpc-testing-proto'), project(':grpc-core').sourceSets.test.output From 32aa3896b0f36b186b838a7ad74e3496c537fab1 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 17 Dec 2019 18:51:32 -0500 Subject: [PATCH 2/2] upgrade auth --- build.gradle | 2 +- repositories.bzl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e5312f0a7c9..43320a50a76 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ subprojects { nettyVersion = '4.1.42.Final' guavaVersion = '28.1-android' - googleauthVersion = '0.18.0' + googleauthVersion = '0.19.0' protobufVersion = '3.11.0' protocVersion = protobufVersion opencensusVersion = '0.24.0' diff --git a/repositories.bzl b/repositories.bzl index b7db90c318f..a12ce5f383c 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -182,18 +182,18 @@ def com_google_api_grpc_google_common_protos(): def com_google_auth_google_auth_library_credentials(): jvm_maven_import_external( name = "com_google_auth_google_auth_library_credentials", - artifact = "com.google.auth:google-auth-library-credentials:0.18.0", + artifact = "com.google.auth:google-auth-library-credentials:0.19.0", server_urls = ["http://central.maven.org/maven2"], - artifact_sha256 = "2377b149dbf63f000f96b66f5dc0f07b9da3928f5e3f31973f2d21fcb63ce6ff", + artifact_sha256 = "3f81ea05795abc40daf36f4c427487a738489f7cc0f515b7930f838ed301165a", licenses = ["notice"], # BSD 3-clause ) def com_google_auth_google_auth_library_oauth2_http(): jvm_maven_import_external( name = "com_google_auth_google_auth_library_oauth2_http", - artifact = "com.google.auth:google-auth-library-oauth2-http:0.18.0", + artifact = "com.google.auth:google-auth-library-oauth2-http:0.19.0", server_urls = ["http://central.maven.org/maven2"], - artifact_sha256 = "2f13eff0105debe54a91851684b78dd5a0f3839fae5acaa8ba7959c004c050d0", + artifact_sha256 = "51992d58ec0f903fb521412f677bd09d83895609a0198d4a9ae65a3d88e2aa4a", licenses = ["notice"], # BSD 3-clause )