Use libs in DependencyHandlerScope extensions

gradle/libs.versions.toml

@@ -36,7 +36,6 @@ test_core = "1.5.0"
 coil = "2.2.2"
 datetime = "0.4.0"
 serialization_json = "1.5.0"
-# Warning, also hard-coded in composeDependencies()
 showkase = "1.0.0-beta17"
 jsoup = "1.15.4"
 appyx = "1.0.5"

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

@@ -26,8 +26,8 @@ import org.gradle.kotlin.dsl.project
 /**
  * Dependencies used by all the modules
  */
-fun DependencyHandlerScope.commonDependencies() {
+fun DependencyHandlerScope.commonDependencies(libs: LibrariesForLibs) {
-    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation(libs.timber)
 }
 
 /**
@@ -42,10 +42,10 @@ fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) {
     implementation("androidx.compose.material3:material3")
     implementation("androidx.compose.material:material-icons-extended")
     implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.activity:activity-compose:1.6.1")
+    implementation(libs.androidx.activity.compose)
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
-    implementation("com.airbnb.android:showkase:1.0.0-beta17")
+    implementation(libs.showkase)
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 }
 

plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts

@@ -36,6 +36,6 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
     composeDependencies(libs)
 }

plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts

@@ -44,6 +44,6 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
     composeDependencies(libs)
 }

plugins/src/main/kotlin/io.element.android-library.gradle.kts

@@ -19,6 +19,9 @@
  */
 import extension.androidConfig
 import extension.commonDependencies
+import org.gradle.accessors.dm.LibrariesForLibs
+
+val libs = the<LibrariesForLibs>()
 
 plugins {
     id("com.android.library")
@@ -38,5 +41,5 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
 }