Skip to content

Commit

Permalink
Upgrade firebase, slf4j, avoid gRPC version conflict
Browse files Browse the repository at this point in the history
The latest firebase-admin (v6.12.2) 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.

Transitive dependencies grpc-netty-shaded, grpc-protobuf,
grpc-protobuf-lite, grpc-protobuf-stub, grpc-protobuf-grpclb
(v1.23.0) are also excluded.

Upgraded slf4j version requirement to match that of other
dependencies.  This removes a duplicated dependency, and corrects
the gradle-witness.gradle slf4-api entry, which verified slf4-api
v1.7.22, not the transitive dependency loaded at runtime.

Beyond avoiding general version hell issues, eliminating version
conflicts saves a dev time thinking about which source jar to
choose from while examining exception stack traces.

Partial fix for bisq-network#4086
  • Loading branch information
ghubstan committed Mar 22, 2020
1 parent 17bb7b4 commit ca18bc3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
15 changes: 12 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 @@ -65,7 +65,7 @@ configure(subprojects) {
pushyVersion = '0.13.2'
qrgenVersion = '1.3'
sarxosVersion = '0.3.12'
slf4jVersion = '1.7.22'
slf4jVersion = '1.7.25'
sparkVersion = '2.5.2'
springBootVersion = '1.5.10.RELEASE'

Expand Down Expand Up @@ -428,7 +428,16 @@ 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')
exclude(module: 'grpc-protobuf')
exclude(module: 'grpc-protobuf-lite')
exclude(module: 'grpc-protobuf-stub')
exclude(module: 'grpc-protobuf-grpclb')
exclude(module: 'grpc-netty-shaded')
}
compile "commons-codec:commons-codec:$codecVersion"
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/witness/gradle-witness.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ dependencyVerification {
'org.jetbrains.kotlin:kotlin-stdlib-jdk8:f7dbbaee3e0841758187a213c052388a4e619e11c87ab16f4bc229cfe7ce5fed',
'org.jetbrains.kotlin:kotlin-stdlib:6ea3d0921b26919b286f05cbdb906266666a36f9a7c096197114f7495708ffbc',
'org.jetbrains:annotations:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
'org.slf4j:slf4j-api:3a4cd4969015f3beb4b5b4d81dbafc01765fb60b8a439955ca64d8476fef553e',
'org.slf4j:slf4j-api:18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79',
'org.tukaani:xz:a594643d73cc01928cf6ca5ce100e094ea9d73af760a5d4fb6b75fa673ecec96',
]
}

0 comments on commit ca18bc3

Please sign in to comment.