Skip to content

Commit 08efd97

Browse files
authored
all: remove duplicated dependency (#5207)
1 parent 4337da6 commit 08efd97

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

auth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
compile project(':grpc-core'),
44
libraries.google_auth_credentials
55
testCompile project(':grpc-testing'),
6-
libraries.oauth_client
6+
libraries.google_auth_oauth2_http
77
signature "org.codehaus.mojo.signature:java17:1.0@signature"
88
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
99
}

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ subprojects {
106106
javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"
107107

108108
nettyVersion = '4.1.32.Final'
109+
googleauthVersion = '0.9.0'
109110
guavaVersion = '26.0-android'
110111
protobufVersion = '3.5.1'
111112
protocVersion = '3.5.1-1'
@@ -197,10 +198,9 @@ subprojects {
197198
hpack: 'com.twitter:hpack:0.10.1',
198199
javax_annotation: 'javax.annotation:javax.annotation-api:1.2',
199200
jsr305: 'com.google.code.findbugs:jsr305:3.0.2',
200-
oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.9.0',
201201
google_api_protos: 'com.google.api.grpc:proto-google-common-protos:1.12.0',
202-
google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.9.0',
203-
google_auth_oauth2_http: 'com.google.auth:google-auth-library-oauth2-http:0.9.0',
202+
google_auth_credentials: "com.google.auth:google-auth-library-credentials:${googleauthVersion}",
203+
google_auth_oauth2_http: "com.google.auth:google-auth-library-oauth2-http:${googleauthVersion}",
204204
okhttp: 'com.squareup.okhttp:okhttp:2.5.0',
205205
okio: 'com.squareup.okio:okio:1.13.0',
206206
opencensus_api: "io.opencensus:opencensus-api:${opencensusVersion}",

interop-testing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ dependencies {
2121
project(':grpc-protobuf'),
2222
project(':grpc-stub'),
2323
project(':grpc-testing'),
24+
libraries.google_auth_oauth2_http,
2425
libraries.junit,
25-
libraries.mockito,
26-
libraries.oauth_client
26+
libraries.mockito
2727
compile (libraries.truth) {
2828
// Disable because it uses Java 8 bytecode, which breaks gae-java7
2929
exclude group: 'com.google.auto.value', module: 'auto-value-annotations'

0 commit comments

Comments
 (0)