Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dependency version for AndroidX Lifecycle Extensions #19

Merged
merged 2 commits into from
Jun 8, 2022
Merged

Upgrade dependency version for AndroidX Lifecycle Extensions #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80db614
Upgrade dependency version for AndroidX Lifecycle Extensions
MrHadiSatrio Jun 2, 2022
63ad8dd
Remove enforced version resolution for SQLite JDBC
MrHadiSatrio Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app-state-manager/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ apiValidation {

dependencies {
implementation(deps.kotlin.stdlib.core)
implementation(deps.android.lifecycle.extensions)
implementation(deps.android.androidx.lifecycleExtensions)
implementation(deps.android.androidx.lifecycleCommons)
implementation(deps.android.androidx.lifecycleProcess)
}

apply(from = "${rootProject.projectDir}/gradle/publish-module.gradle")
5 changes: 5 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ allprojects {
mavenCentral()
mavenLocal()
}
configurations.all {
resolutionStrategy {
force("org.xerial:sqlite-jdbc:3.34.0")
}
}
}

subprojects {
Expand Down
12 changes: 5 additions & 7 deletions buildSrc/src/main/kotlin/deps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object versions {
const val navigation = "2.1.0-rc01"
const val coroutines = "1.3.2"
const val broadcast = "1.0.0"
const val lifecycle = "1.1.1"
const val lifecycle = "2.4.1"
const val room = "2.2.5"
const val retrofit = "2.6.2"
const val groovy = "2.5.7"
Expand Down Expand Up @@ -68,10 +68,6 @@ object deps {
"androidx.localbroadcastmanager:localbroadcastmanager:${versions.broadcast}"
}

object lifecycle {
const val extensions = "android.arch.lifecycle:extensions:${versions.lifecycle}"
}

object room {
const val roomRuntime = "androidx.room:room-runtime:${versions.room}"
const val roomRxJava = "androidx.room:room-rxjava2:${versions.room}"
Expand All @@ -80,14 +76,16 @@ object deps {

object androidx {
const val appcompact = "androidx.appcompat:appcompat:${versions.appCompact}"
const val fragmentExtensions =
"androidx.fragment:fragment-ktx:${versions.activityVersion}"
const val fragmentExtensions = "androidx.fragment:fragment-ktx:${versions.activityVersion}"
const val constraintLayout = "androidx.constraintlayout:constraintlayout:${versions.constraintLayoutVersion}"
const val coreKtx = "androidx.core:core-ktx:${versions.coreKtxVersion}"
const val supportV4 = "androidx.legacy:legacy-support-v4:${versions.supportV4Version}"
const val recyclerView = "androidx.recyclerview:recyclerview:${versions.recyclerViewVersion}"
const val material = "com.google.android.material:material:${versions.materialVersion}"
const val annotation = "androidx.annotation:annotation:${versions.annotationVersion}"
const val lifecycleExtensions = "androidx.lifecycle:lifecycle-runtime-ktx:${versions.lifecycle}"
const val lifecycleCommons = "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}"
const val lifecycleProcess = "androidx.lifecycle:lifecycle-process:${versions.lifecycle}"
}
}

Expand Down
3 changes: 2 additions & 1 deletion chuck-mqtt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ dependencies {

implementation(deps.android.gson)

implementation(deps.android.lifecycle.extensions)
implementation(deps.android.androidx.lifecycleExtensions)
implementation(deps.android.androidx.lifecycleCommons)

implementation(deps.android.androidx.appcompact)
implementation(deps.android.androidx.fragmentExtensions)
Expand Down
4 changes: 3 additions & 1 deletion courier-core-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ apiValidation {

dependencies {
api(project(":courier-core"))
implementation(deps.android.lifecycle.extensions)
implementation(deps.android.androidx.lifecycleExtensions)
implementation(deps.android.androidx.lifecycleCommons)
implementation(deps.android.androidx.lifecycleProcess)
}

apply(from = "${rootProject.projectDir}/gradle/publish-module.gradle")
3 changes: 2 additions & 1 deletion mqtt-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ dependencies {
implementation(project(":app-state-manager"))
implementation(project(":timer-pingsender"))

implementation(deps.android.lifecycle.extensions)
implementation(deps.android.androidx.lifecycleExtensions)
implementation(deps.android.androidx.lifecycleCommons)

implementation(deps.android.room.roomRuntime)
kapt(deps.android.room.roomCompiler)
Expand Down
5 changes: 4 additions & 1 deletion network-tracker/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ apiValidation {

dependencies {
api(project(":courier-core"))
implementation(deps.android.lifecycle.extensions)
implementation(deps.android.androidx.coreKtx)
implementation(deps.android.androidx.lifecycleExtensions)
implementation(deps.android.androidx.lifecycleCommons)
implementation(deps.android.androidx.lifecycleProcess)

testImplementation(deps.android.test.kotlinTestJunit)
}
Expand Down
4 changes: 3 additions & 1 deletion pingsender/alarm-pingsender/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ apiValidation {
dependencies {
api(project(":mqtt-pingsender"))
implementation(project(":courier-core-android"))
implementation(deps.android.lifecycle.extensions)
implementation(deps.android.androidx.lifecycleExtensions)
implementation(deps.android.androidx.lifecycleCommons)
implementation(deps.android.androidx.lifecycleProcess)

testImplementation(deps.android.test.kotlinTestJunit)
}
Expand Down