Skip to content

Commit

Permalink
Update dependency libs version
Browse files Browse the repository at this point in the history
  • Loading branch information
acktsap committed Sep 24, 2019
1 parent 65fb301 commit 3e0d48a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 24 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ def jmhProjects = [
]

ext {
bouncyCastleVersion = '1.60'
grpcVersion = '1.13.1'
guavaVersion = '20.0'
bouncyCastleVersion = '1.63'
grpcVersion = '1.23.0'
guavaVersion = '28.0'
lombokVersion = '1.18.8'
}

Expand Down
10 changes: 3 additions & 7 deletions core/protobuf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,9 @@ protobuf {
}

dependencies {
implementation ("com.google.guava:guava:${guavaVersion}")
implementation ("io.grpc:grpc-protobuf:${grpcVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
implementation ("io.grpc:grpc-stub:${grpcVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
implementation ("io.grpc:grpc-protobuf:${grpcVersion}")
implementation ("io.grpc:grpc-stub:${grpcVersion}")

if (JavaVersion.current().isJava9Compatible()) {
// Workaround for @javax.annotation.Generated
// see: https://github.com/grpc/grpc-java/issues/3633
Expand Down
18 changes: 5 additions & 13 deletions core/transport/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,11 @@ dependencies {
implementation project(":core:protobuf")
implementation project(":core:common")

implementation ("com.google.guava:guava:${guavaVersion}")
implementation "com.google.guava:guava:${guavaVersion}-android"
implementation "com.fasterxml.jackson.core:jackson-databind:2.6.7"

implementation ("io.grpc:grpc-okhttp:${grpcVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
implementation ("io.grpc:grpc-netty-shaded:${grpcVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
implementation ("io.grpc:grpc-protobuf:${grpcVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
implementation ("io.grpc:grpc-stub:${grpcVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
implementation "io.grpc:grpc-okhttp:${grpcVersion}"
implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
implementation "io.grpc:grpc-stub:${grpcVersion}"
}
2 changes: 1 addition & 1 deletion core/util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

dependencies {
implementation project(":core:annotation")
implementation "com.google.guava:guava:${guavaVersion}"
implementation "com.google.guava:guava:${guavaVersion}-android"
implementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
}

0 comments on commit 3e0d48a

Please sign in to comment.