mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Change compose setup to use Gradle version catalog instead of hard coded values

Browse Source
This commit is contained in:
Wolf Montwé 2023-03-16 12:58:10 +01:00
parent f3c58438b9
commit 9f11765a6f
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build-plugin/src/main/kotlin/thunderbird.app.android.compose.gradle.kts
View File

@ -17,19 +17,19 @@ android {
}
dependencies {
val composeBom = platform("androidx.compose:compose-bom:${libs.versions.androidxComposeBom.get()}")
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)
implementation("androidx.compose.foundation:foundation")
implementation(libs.androidx.compose.foundation)
// Android Studio Preview support
implementation("androidx.compose.ui:ui-tooling-preview")
debugImplementation("androidx.compose.ui:ui-tooling")
implementation(libs.androidx.compose.ui.tooling.preview)
debugImplementation(libs.androidx.compose.ui.tooling)
// UI Tests
debugImplementation("androidx.compose.ui:ui-test-manifest")
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation(libs.androidx.compose.ui.test.manifest)
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
implementation(libs.androidx.compose.lifecycle.viewmodel)

12
build-plugin/src/main/kotlin/thunderbird.library.android.compose.gradle.kts
View File

@ -7,19 +7,19 @@ android {
}
dependencies {
val composeBom = platform("androidx.compose:compose-bom:${libs.versions.androidxComposeBom.get()}")
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)
implementation("androidx.compose.foundation:foundation")
implementation(libs.androidx.compose.foundation)
// Android Studio Preview support
implementation("androidx.compose.ui:ui-tooling-preview")
debugImplementation("androidx.compose.ui:ui-tooling")
implementation(libs.androidx.compose.ui.tooling.preview)
debugImplementation(libs.androidx.compose.ui.tooling)
// UI Tests
debugImplementation("androidx.compose.ui:ui-test-manifest")
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation(libs.androidx.compose.ui.test.manifest)
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
implementation(libs.androidx.compose.lifecycle.viewmodel)
}

6
gradle/libs.versions.toml
View File

@ -72,6 +72,12 @@ androidx-localbroadcastmanager = "androidx.localbroadcastmanager:localbroadcastm
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
androidx-preference = { module = "androidx.preference:preference", version.ref = "androidxPreference" }
androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidxComposeBom" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
androidx-compose-activity = "androidx.activity:activity-compose:1.6.1"
androidx-compose-lifecycle-viewmodel = "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
androidx-compose-material = "androidx.compose.material:material:1.3.1"