Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Timber for all modules

Browse source
This commit is contained in:
Benoit Marty 2022-12-09 15:42:29 +01:00
parent 7153837a80
commit 4136ba94e5
11 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -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)

2
features/login/build.gradle.kts
View file

@ -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)
}

1
features/messages/build.gradle.kts
View file

@ -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)

3
features/onboarding/build.gradle.kts
View file

@ -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)
}
}

3
features/roomlist/build.gradle.kts
View file

@ -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)
}
}

2
gradle/libs.versions.toml
View file

@ -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" }

3
libraries/matrix/build.gradle.kts
View file

@ -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)
}
}

10
plugins/src/main/java/extension/DependencyHandleScope.kt
View file

@ -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)

2
plugins/src/main/java/io.element.android-compose-application.gradle.kts
View file

@ -1,4 +1,5 @@
import extension.androidConfig
import extension.commonDependencies
import extension.composeConfig
import extension.composeDependencies
@ -13,5 +14,6 @@ android {
}
dependencies {
commonDependencies()
composeDependencies()
}

2
plugins/src/main/java/io.element.android-compose-library.gradle.kts
View file

@ -1,4 +1,5 @@
import extension.androidConfig
import extension.commonDependencies
import extension.composeConfig
import extension.composeDependencies
@ -13,5 +14,6 @@ android {
}
dependencies {
commonDependencies()
composeDependencies()
}

5
plugins/src/main/java/io.element.android-library.gradle.kts
View file

@ -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()
}