Skip to content

Commit 3350be4

Browse files
Merge branch 'grpc:master' into master
2 parents 85758e3 + f774a15 commit 3350be4

60 files changed

Lines changed: 9501 additions & 4233 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

auth/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ java_library(
1111
"//api",
1212
artifact("com.google.auth:google-auth-library-credentials"),
1313
artifact("com.google.code.findbugs:jsr305"),
14-
artifact("com.google.code.gson:gson"),
1514
artifact("com.google.guava:guava"),
1615
],
1716
)

auth/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ tasks.named("jar").configure {
1717
dependencies {
1818
api project(':grpc-api'),
1919
libraries.google.auth.credentials
20-
implementation libraries.guava,
21-
libraries.gson
20+
implementation libraries.guava
2221
testImplementation project(':grpc-testing'),
2322
project(':grpc-core'),
2423
project(":grpc-context"), // Override google-auth dependency with our newer version

auth/src/main/java/io/grpc/auth/JwtTokenFileCallCredentials.java

Lines changed: 0 additions & 342 deletions
This file was deleted.

0 commit comments

Comments
 (0)