From 4136ba94e50931a336cbd1456f2effac8e135704 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 9 Dec 2022 15:42:29 +0100 Subject: [PATCH] Timber for all modules --- app/build.gradle.kts | 1 - features/login/build.gradle.kts | 2 -- features/messages/build.gradle.kts | 1 - features/onboarding/build.gradle.kts | 3 +-- features/roomlist/build.gradle.kts | 3 +-- gradle/libs.versions.toml | 2 -- libraries/matrix/build.gradle.kts | 3 +-- .../src/main/java/extension/DependencyHandleScope.kt | 10 ++++++++++ .../io.element.android-compose-application.gradle.kts | 2 ++ .../java/io.element.android-compose-library.gradle.kts | 2 ++ .../main/java/io.element.android-library.gradle.kts | 5 +++++ 11 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b5f1a3d79c..328ec1d8e1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -173,7 +173,6 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(libs.androidx.activity.compose) implementation(libs.coil) - implementation(libs.timber) implementation(libs.mavericks.compose) implementation(libs.showkase) diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 792db254a1..4939b222d6 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -14,8 +14,6 @@ dependencies { implementation(project(":libraries:elementresources")) implementation(libs.mavericks.compose) ksp(libs.showkase.processor) - implementation(libs.timber) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) - } diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index ff5a98fb4b..8773d07f79 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { implementation(project(":libraries:textcomposer")) implementation(libs.mavericks.compose) implementation(libs.coil.compose) - implementation(libs.timber) implementation(libs.datetime) implementation(libs.accompanist.flowlayout) implementation(libs.androidx.recyclerview) diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index b878aed3c7..a808aa7d8d 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -12,10 +12,9 @@ dependencies { implementation(project(":libraries:elementresources")) implementation(project(":libraries:designsystem")) implementation(libs.mavericks.compose) - implementation(libs.timber) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) ksp(libs.showkase.processor) -} \ No newline at end of file +} diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index 749fbeb6d8..259679be70 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -12,10 +12,9 @@ dependencies { implementation(project(":libraries:matrix")) implementation(project(":libraries:designsystem")) implementation(libs.mavericks.compose) - implementation(libs.timber) implementation(libs.datetime) implementation(libs.accompanist.placeholder) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) ksp(libs.showkase.processor) -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aab5e51158..94066aefea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,7 +37,6 @@ test_orchestrator = "1.4.1" #other mavericks = "3.0.1" -timber = "5.0.1" coil = "2.2.1" datetime = "0.4.0" wysiwyg = "0.7.0.1" @@ -93,7 +92,6 @@ test_hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "test_hamcrest test_orchestrator = { module = "androidx.test:orchestrator", version.ref = "test_orchestrator" } mavericks_compose = { module = "com.airbnb.android:mavericks-compose", version.ref = "mavericks" } -timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } coil = { module = "io.coil-kt:coil", version.ref = "coil" } coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" } diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts index b420b32794..75bb1c7b35 100644 --- a/libraries/matrix/build.gradle.kts +++ b/libraries/matrix/build.gradle.kts @@ -10,9 +10,8 @@ android { dependencies { api(project(":libraries:rustsdk")) implementation(project(":libraries:core")) - implementation(libs.timber) implementation("net.java.dev.jna:jna:5.12.1@aar") implementation(libs.coil.compose) implementation(libs.androidx.datastore.preferences) implementation(libs.serialization.json) -} \ No newline at end of file +} diff --git a/plugins/src/main/java/extension/DependencyHandleScope.kt b/plugins/src/main/java/extension/DependencyHandleScope.kt index 76432bec08..47204ee0be 100644 --- a/plugins/src/main/java/extension/DependencyHandleScope.kt +++ b/plugins/src/main/java/extension/DependencyHandleScope.kt @@ -5,6 +5,16 @@ import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplem import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation import org.gradle.kotlin.dsl.DependencyHandlerScope +/** + * Dependencies used by all the modules + */ +fun DependencyHandlerScope.commonDependencies() { + implementation("com.jakewharton.timber:timber:5.0.1") +} + +/** + * Dependencies used by all the modules with composable items + */ fun DependencyHandlerScope.composeDependencies() { val composeBom = platform("androidx.compose:compose-bom:2022.11.00") implementation(composeBom) diff --git a/plugins/src/main/java/io.element.android-compose-application.gradle.kts b/plugins/src/main/java/io.element.android-compose-application.gradle.kts index 7f5b450499..3cc8808cf3 100644 --- a/plugins/src/main/java/io.element.android-compose-application.gradle.kts +++ b/plugins/src/main/java/io.element.android-compose-application.gradle.kts @@ -1,4 +1,5 @@ import extension.androidConfig +import extension.commonDependencies import extension.composeConfig import extension.composeDependencies @@ -13,5 +14,6 @@ android { } dependencies { + commonDependencies() composeDependencies() } diff --git a/plugins/src/main/java/io.element.android-compose-library.gradle.kts b/plugins/src/main/java/io.element.android-compose-library.gradle.kts index 0c1f92abf7..1a1603f1d7 100644 --- a/plugins/src/main/java/io.element.android-compose-library.gradle.kts +++ b/plugins/src/main/java/io.element.android-compose-library.gradle.kts @@ -1,4 +1,5 @@ import extension.androidConfig +import extension.commonDependencies import extension.composeConfig import extension.composeDependencies @@ -13,5 +14,6 @@ android { } dependencies { + commonDependencies() composeDependencies() } diff --git a/plugins/src/main/java/io.element.android-library.gradle.kts b/plugins/src/main/java/io.element.android-library.gradle.kts index 3def35dba3..37185e5024 100644 --- a/plugins/src/main/java/io.element.android-library.gradle.kts +++ b/plugins/src/main/java/io.element.android-library.gradle.kts @@ -1,4 +1,5 @@ import extension.androidConfig +import extension.commonDependencies plugins { id("com.android.library") @@ -8,3 +9,7 @@ plugins { android { androidConfig(project) } + +dependencies { + commonDependencies() +}