From fea6b2289cb665c988074703697751045a911dda Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 9 Mar 2023 09:59:29 +0100
Subject: [PATCH] Use libs in DependencyHandlerScope extensions

---
 gradle/libs.versions.toml                                 | 1 -
 .../src/main/kotlin/extension/DependencyHandleScope.kt    | 8 ++++----
 .../io.element.android-compose-application.gradle.kts     | 2 +-
 .../kotlin/io.element.android-compose-library.gradle.kts  | 2 +-
 .../src/main/kotlin/io.element.android-library.gradle.kts | 5 ++++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3ce745aa18..99a3e6e4a0 100644
--- a/gradle/libs.versions.toml
+++ b/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"
diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
index 87e6b41094..59a11e9c83 100644
--- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
+++ b/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() {
-    implementation("com.jakewharton.timber:timber:5.0.1")
+fun DependencyHandlerScope.commonDependencies(libs: LibrariesForLibs) {
+    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")
 }
 
diff --git a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
index 0697992d5e..701119f7c4 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
@@ -36,6 +36,6 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
     composeDependencies(libs)
 }
diff --git a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
index ec71446294..1341db3d2e 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
@@ -44,6 +44,6 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
     composeDependencies(libs)
 }
diff --git a/plugins/src/main/kotlin/io.element.android-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
index 755a00f316..5d7e73e5bd 100644
--- a/plugins/src/main/kotlin/io.element.android-library.gradle.kts
+++ b/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)
 }