wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix dependency conflicts for ui-utils

Browse source
This commit is contained in:
Wolf Montwé 2023-04-11 17:18:49 +02:00
parent 2727a8a1da
commit d17f27244c
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gradle/libs.versions.toml
View file

@ -63,15 +63,18 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidxLifecycle" }
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidxLifecycle" }
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidxLifecycle" }
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" }
androidx-annotation = "androidx.annotation:annotation:1.6.0"
androidx-biometric = "androidx.biometric:biometric:1.1.0"
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidxNavigation" }
androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidxNavigation" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidxConstraintLayout" }
androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
androidx-work-ktx = "androidx.work:work-runtime-ktx:2.8.1"
androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidxFragment" }
androidx-localbroadcastmanager = "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0"
androidx-core = { module = "androidx.core:core", version.ref = "androidxCore" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxCoreSplashscreen" }
androidx-preference = { module = "androidx.preference:preference", version.ref = "androidxPreference" }
@ -152,10 +155,12 @@ shared-jvm-main = [
"kotlinx-datetime",
]
shared-jvm-android = [
"androidx-core",
"androidx-core-ktx",
"koin-android",
]
shared-jvm-android-app = [
"androidx-activity",
"androidx-core-splashscreen",
"android-material",
]

2
ui-utils/ItemTouchHelper/build.gradle.kts
View file

@ -4,6 +4,8 @@ plugins {
dependencies {
api(libs.androidx.recyclerview)
implementation(libs.androidx.annotation)
}
android {

2
ui-utils/LinearLayoutManager/build.gradle.kts
View file

@ -4,6 +4,8 @@ plugins {
dependencies {
api(libs.androidx.recyclerview)
implementation(libs.androidx.annotation)
}
android {

6
ui-utils/ToolbarBottomSheet/build.gradle.kts
View file

@ -3,7 +3,13 @@ plugins {
}
dependencies {
api(libs.androidx.appcompat)
api(libs.android.material)
api(libs.androidx.coordinatorlayout)
implementation(libs.androidx.annotation)
implementation(libs.androidx.fragment)
implementation(libs.androidx.lifecycle.viewmodel)
}
android {