Skip to content

Commit

Permalink
Upgrade firebase-admin, avoid gRPC version conflict
Browse files Browse the repository at this point in the history
The latest firebase-admin depends on grpc-api v1.24.1, which is as close
as we can get to the grpc v1.25.0 specified in build.gradle.  Currently,
the firebase-admin version requirement is causing the build to download
grpc v1.10.1 jars, but at runtime, grpc 1.25.0 jars are loaded.

Partial fix for bisq-network#4086
  • Loading branch information
ghubstan committed Mar 21, 2020
1 parent 17bb7b4 commit 5be4deb
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ configure(subprojects) {
easybindVersion = '1.0.3'
easyVersion = '4.0.1'
findbugsVersion = '3.0.2'
firebaseVersion = '6.2.0'
firebaseVersion = '6.12.2'
fontawesomefxVersion = '8.0.0'
fontawesomefxCommonsVersion = '9.1.2'
fontawesomefxMaterialdesignfontVersion = '2.0.26-9.1.2'
Expand Down Expand Up @@ -331,7 +331,7 @@ configure(project(':desktop')) {

version = '1.2.9-SNAPSHOT'

mainClassName = 'bisq.desktop.app.BisqAppMain'
mainClassName = 'bisq.deskgrpc-authtop.app.BisqAppMain'

tasks.withType(AbstractArchiveTask) {
preserveFileTimestamps = false
Expand Down Expand Up @@ -428,7 +428,11 @@ configure(project(':relay')) {
compile project(':common')
compile "com.sparkjava:spark-core:$sparkVersion"
compile "com.turo:pushy:$pushyVersion"
compile "com.google.firebase:firebase-admin:$firebaseVersion"
implementation("com.google.firebase:firebase-admin:$firebaseVersion") {
exclude(module: 'grpc-core')
exclude(module: 'grpc-api')
exclude(module: 'grpc-context')
}
compile "commons-codec:commons-codec:$codecVersion"
}
}
Expand Down

0 comments on commit 5be4deb

Please sign in to comment.