Skip to content

Commit 347421a

Browse files
authored
Merge pull request #15 from taetae98coding/upgrade_lifecycle
Lifecycle dependency upgrade 2.8.0-rc01
2 parents 8e82acb + ac95730 commit 347421a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ dependencies {
155155
aar("com.google.firebase:firebase-config:21.6.0")
156156
aar("com.google.firebase:firebase-installations:17.2.0")
157157
// extracted aar dependencies
158-
api(fileTree(mapOf("dir" to "build/jar", "include" to listOf("*.jar"))))
158+
// exclude lifecycle libs due to https://github.com/GitLiveApp/firebase-java-sdk/pull/15 - remove the exclude once the dependencies in the aars are updated to the required version
159+
api(fileTree(mapOf("dir" to "build/jar", "include" to listOf("*.jar"), "exclude" to listOf("lifecycle-*"))))
159160
// polyfill dependencies
160161
implementation("org.jetbrains.kotlin:kotlin-stdlib")
161162
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
@@ -165,12 +166,12 @@ dependencies {
165166
// firebase dependencies
166167
implementation("javax.inject:javax.inject:1")
167168
implementation("com.squareup.okhttp3:okhttp:3.12.13")
168-
implementation("android.arch.lifecycle:common:1.1.1")
169169
implementation("io.grpc:grpc-protobuf-lite:1.52.1")
170170
implementation("io.grpc:grpc-stub:1.52.1")
171171
implementation("androidx.collection:collection:1.2.0")
172-
implementation("androidx.lifecycle:lifecycle-common:2.4.0")
173172
implementation("io.grpc:grpc-okhttp:1.52.1")
173+
implementation("androidx.lifecycle:lifecycle-common:2.8.0-rc01")
174+
implementation("androidx.lifecycle:lifecycle-viewmodel:2.8.0-rc01")
174175
}
175176

176177
tasks.named("publishToMavenLocal").configure {

0 commit comments

Comments
 (0)