Merge pull request #1787 from vector-im/feature/bma/gradleCleanup

Gradle catalog cleanup

anvilcodegen/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     implementation(projects.anvilannotations)
     api(libs.anvil.compiler.api)
     implementation(libs.anvil.compiler.utils)
-    implementation("com.squareup:kotlinpoet:1.14.2")
+    implementation(libs.kotlinpoet)
     implementation(libs.dagger)
     compileOnly(libs.google.autoservice.annotations)
     kapt(libs.google.autoservice)

app/build.gradle.kts

@@ -27,8 +27,8 @@ plugins {
     alias(libs.plugins.anvil)
     alias(libs.plugins.ksp)
     alias(libs.plugins.kapt)
-    id("com.google.firebase.appdistribution") version "4.0.1"
+    alias(libs.plugins.firebaseAppDistribution)
-    id("org.jetbrains.kotlinx.knit") version "0.4.0"
+    alias(libs.plugins.knit)
     id("kotlin-parcelize")
     // To be able to update the firebase.xml files, uncomment and build the project
     // id("com.google.gms.google-services")

build.gradle.kts

@@ -5,8 +5,8 @@ import org.jetbrains.kotlin.cli.common.toBooleanLenient
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+        classpath(libs.kotlin.gradle.plugin)
-        classpath("com.google.gms:google-services:4.4.0")
+        classpath(libs.gms.google.services)
     }
 }
 

features/login/impl/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
     alias(libs.plugins.anvil)
     alias(libs.plugins.ksp)
     id("kotlin-parcelize")
-    kotlin("plugin.serialization") version "1.9.20"
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {

features/rageshake/impl/build.gradle.kts

@@ -44,7 +44,7 @@ dependencies {
     api(projects.features.rageshake.api)
     implementation(libs.androidx.datastore.preferences)
     implementation(platform(libs.network.okhttp.bom))
-    implementation("com.squareup.okhttp3:okhttp")
+    implementation(libs.network.okhttp.okhttp)
     implementation(libs.coil)
     implementation(libs.coil.compose)
     ksp(libs.showkase.processor)

gradle.properties

@@ -49,7 +49,7 @@ signing.element.nightly.keyPassword=Secret
 
 # Customise the Lint version to use a more recent version than the one bundled with AGP
 # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
-android.experimental.lint.version=8.3.0-alpha11
+android.experimental.lint.version=8.3.0-alpha12
 
 # Enable test fixture for all modules by default
 android.experimental.enableTestFixtures=true

gradle/libs.versions.toml

@@ -6,19 +6,16 @@
 android_gradle_plugin = "8.1.3"
 kotlin = "1.9.20"
 ksp = "1.9.20-1.0.14"
-molecule = "1.3.0"
+firebaseAppDistribution = "4.0.1"
 
 # AndroidX
 core = "1.12.0"
 datastore = "1.0.0"
 constraintlayout = "2.1.4"
 constraintlayout_compose = "1.0.1"
-recyclerview = "1.3.2"
 lifecycle = "2.7.0-beta01"
 activity = "1.8.0"
-startup = "1.1.1"
 media3 = "1.1.1"
-browser = "1.6.0"
 
 # Compose
 compose_bom = "2023.10.01"
@@ -38,13 +35,8 @@ coil = "2.5.0"
 datetime = "0.4.1"
 serialization_json = "1.6.0"
 showkase = "1.0.2"
-jsoup = "1.16.2"
 appyx = "1.4.0"
-dependencycheck = "8.4.2"
-dependencyanalysis = "1.25.0"
-stem = "2.3.0"
 sqldelight = "2.0.0"
-telephoto = "0.6.2"
 wysiwyg = "2.16.0"
 
 # DI
@@ -55,12 +47,9 @@ anvil = "2.4.8-1-8"
 autoservice = "1.1.1"
 
 # quality
-detekt = "1.23.3"
-dependencygraph = "0.12"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
 espresso-core = "3.5.1"
-appcompat = "1.6.1"
 
 [libraries]
 # Project
@@ -68,21 +57,23 @@ android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref
 # https://developer.android.com/studio/write/java8-support#library-desugaring-versions
 android_desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
 kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+gms_google_services = "com.google.gms:google-services:4.4.0"
 # https://firebase.google.com/docs/android/setup#available-libraries
 google_firebase_bom = "com.google.firebase:firebase-bom:32.5.0"
+firebase_appdistribution_gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppDistribution" }
 
 # AndroidX
 androidx_core = { module = "androidx.core:core", version.ref = "core" }
 androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" }
-androidx_annotationjvm = { module = "androidx.annotation:annotation-jvm", version = "1.7.0" }
+androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.7.0"
 androidx_datastore_preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 androidx_datastore_datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
 androidx_exifinterface = "androidx.exifinterface:exifinterface:1.3.6"
 androidx_constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx_constraintlayout_compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayout_compose" }
 
-androidx_recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
+androidx_recyclerview = "androidx.recyclerview:recyclerview:1.3.2"
-androidx_browser = { module = "androidx.browser:browser", version.ref = "browser" }
+androidx_browser = "androidx.browser:browser:1.6.0"
 androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx_lifecycle_process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
 androidx_splash = "androidx.core:core-splashscreen:1.0.1"
@@ -93,12 +84,18 @@ androidx_biometric = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
 androidx_activity_activity = { module = "androidx.activity:activity", version.ref = "activity" }
 androidx_activity_compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
-androidx_startup = { module = "androidx.startup:startup-runtime", version.ref = "startup" }
+androidx_startup = "androidx.startup:startup-runtime:1.1.1"
 androidx_preference = "androidx.preference:preference:1.2.1"
 androidx_webkit = "androidx.webkit:webkit:1.8.0"
 
-androidx_compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
+androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
 androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha10"
+androidx_compose_ui = { module = "androidx.compose.ui:ui" }
+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_material = { module = "androidx.compose.material:material" }
+androidx_compose_material_icons = { module = "androidx.compose.material:material-icons-extended" }
 
 # Coroutines
 coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
@@ -114,6 +111,7 @@ squareup_seismic = "com.squareup:seismic:1.0.3"
 # network
 network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:4.12.0"
 network_okhttp_logging = { module = "com.squareup.okhttp3:logging-interceptor" }
+network_okhttp_okhttp = { module = "com.squareup.okhttp3:okhttp" }
 network_okhttp = { module = "com.squareup.okhttp3:okhttp" }
 network_retrofit = "com.squareup.retrofit2:retrofit:2.9.0"
 network_retrofit_converter_serialization = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
@@ -124,13 +122,9 @@ test_corektx = { module = "androidx.test:core-ktx", version.ref = "test_core" }
 test_arch_core = "androidx.arch.core:core-testing:2.2.0"
 test_junit = "junit:junit:4.13.2"
 test_runner = "androidx.test:runner:1.5.2"
-test_uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
 test_junitext = "androidx.test.ext:junit:1.1.5"
 test_mockk = "io.mockk:mockk:1.13.8"
-test_barista = "com.adevinta.android:barista:4.3.0"
 test_konsist = "com.lemonappdev:konsist:0.13.0"
-test_hamcrest = "org.hamcrest:hamcrest:2.2"
-test_orchestrator = "androidx.test:orchestrator:1.4.2"
 test_turbine = "app.cash.turbine:turbine:1.0.0"
 test_truth = "com.google.truth:truth:1.1.5"
 test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.14"
@@ -143,11 +137,12 @@ coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
 datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
 serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
+kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5"
 showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" }
 showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" }
-jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
+jsoup = "org.jsoup:jsoup:1.16.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
-molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
+molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
 matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.67"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
@@ -160,12 +155,13 @@ sqlite = "androidx.sqlite:sqlite-ktx:2.4.0"
 unifiedpush = "com.github.UnifiedPush:android-connector:2.1.1"
 otaliastudios_transcoder = "com.otaliastudios:transcoder:0.10.5"
 vanniktech_blurhash = "com.vanniktech:blurhash:0.1.0"
-telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "telephoto" }
+telephoto_zoomableimage = "me.saket.telephoto:zoomable-image-coil:0.6.2"
 statemachine = "com.freeletics.flowredux:compose:1.2.0"
 maplibre = "org.maplibre.gl:android-sdk:10.2.0"
 maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:2.0.2"
 maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:2.0.2"
 opusencoder = "io.element.android:opusencoder:1.1.0"
+kotlinpoet = "com.squareup:kotlinpoet:1.14.2"
 
 # Analytics
 posthog = "com.posthog.android:posthog:2.0.3"
@@ -194,7 +190,7 @@ android_composeCompiler = { module = "androidx.compose.compiler:compiler", versi
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+appcompat = "androidx.appcompat:appcompat:1.6.1"
 
 [bundles]
 
@@ -207,14 +203,16 @@ kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 anvil = { id = "com.squareup.anvil", version.ref = "anvil" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+detekt = "io.gitlab.arturbosch.detekt:1.23.3"
 ktlint = "org.jlleitschuh.gradle.ktlint:11.6.1"
-dependencygraph = { id = "com.savvasdalkitsis.module-dependency-graph", version.ref = "dependencygraph" }
+dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12"
-dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "dependencycheck" }
+dependencycheck = "org.owasp.dependencycheck:8.4.2"
-dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyanalysis" }
+dependencyanalysis = "com.autonomousapps.dependency-analysis:1.25.0"
 paparazzi = "app.cash.paparazzi:1.3.1"
 kover = "org.jetbrains.kotlinx.kover:0.6.1"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
+firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
+knit = { id = "org.jetbrains.kotlinx.knit", version = "0.4.0" }
 
 # Version '4.3.1.3277' introduced some regressions in CI time (more than 2x slower), so make sure
 # this is no longer the case before upgrading.

libraries/matrix/api/build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     id("io.element.android-compose-library")
     id("kotlin-parcelize")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version "1.9.20"
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {

libraries/matrix/impl/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version "1.9.20"
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {

libraries/push/impl/build.gradle.kts

@@ -16,7 +16,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version "1.9.20"
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {

libraries/pushproviders/unifiedpush/build.gradle.kts

@@ -16,7 +16,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version "1.9.20"
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -41,7 +41,7 @@ dependencies {
 
     implementation(projects.libraries.network)
     implementation(platform(libs.network.okhttp.bom))
-    implementation("com.squareup.okhttp3:okhttp")
+    implementation(libs.network.okhttp.okhttp)
     implementation(libs.network.retrofit)
 
     implementation(libs.serialization.json)

plugins/build.gradle.kts

@@ -27,7 +27,6 @@ dependencies {
     implementation(libs.android.gradle.plugin)
     implementation(libs.kotlin.gradle.plugin)
     implementation(platform(libs.google.firebase.bom))
-    // FIXME: using the bom ^, it should not be necessary to provide the version v...
+    implementation(libs.firebase.appdistribution.gradle)
-    implementation("com.google.firebase:firebase-appdistribution-gradle:4.0.1")
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

plugins/src/main/kotlin/extension/DependencyHandleScope.kt

@@ -42,16 +42,16 @@ fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) {
     val composeBom = platform(libs.androidx.compose.bom)
     implementation(composeBom)
     androidTestImplementation(composeBom)
-    implementation("androidx.compose.ui:ui")
+    implementation(libs.androidx.compose.ui)
-    implementation("androidx.compose.material:material")
+    implementation(libs.androidx.compose.material)
-    implementation("androidx.compose.material3:material3")
+    implementation(libs.androidx.compose.material3)
-    implementation("androidx.compose.material:material-icons-extended")
+    implementation(libs.androidx.compose.material.icons)
-    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.activity.compose)
-    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation(libs.androidx.compose.ui.tooling)
-    debugImplementation("androidx.compose.ui:ui-test-manifest")
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
     implementation(libs.showkase)
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
+    implementation(libs.kotlinx.collections.immutable)
 }
 
 private fun DependencyHandlerScope.addImplementationProjects(

tests/konsist/build.gradle.kts

@@ -25,7 +25,7 @@ android {
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     testImplementation(composeBom)
-    testImplementation("androidx.compose.ui:ui-tooling-preview")
+    testImplementation(libs.androidx.compose.ui.tooling.preview)
     testImplementation(libs.test.junit)
     testImplementation(libs.test.konsist)
     testImplementation(libs.test.truth)