Merge develop into feature/fga/dagger_setup

This commit is contained in:
ganfra 2022-12-19 16:14:14 +01:00
commit c040e18431
214 changed files with 2662 additions and 1833 deletions

View file

@ -5,6 +5,7 @@ plugins {
alias(libs.plugins.anvil)
alias(libs.plugins.kapt)
id("com.google.firebase.appdistribution") version "3.0.2"
id("org.jetbrains.kotlinx.knit") version "0.4.0"
}
android {
@ -12,7 +13,7 @@ android {
defaultConfig {
applicationId = "io.element.android.x"
targetSdk = 33
targetSdk = 33 // TODO Use Versions.targetSdk
versionCode = 1
versionName = "1.0"
@ -81,7 +82,6 @@ android {
appId = "1:912726360885:android:e17435e0beb0303000427c"
}
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
@ -111,6 +111,26 @@ android {
}
}
// Knit
apply {
plugin("kotlinx-knit")
}
knit {
files = fileTree(project.rootDir) {
include(
"**/*.md",
"**/*.kt",
"*/*.kts",
)
exclude(
"**/build/**",
"*/.gradle/**",
"*/towncrier/template.md",
"**/CHANGES.md",
)
}
}
dependencies {
implementation(project(":libraries:designsystem"))
@ -134,7 +154,6 @@ dependencies {
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.startup)
implementation(libs.coil)
implementation(libs.timber)
implementation(libs.mavericks.compose)
implementation(libs.dagger)
@ -142,4 +161,4 @@ dependencies {
implementation(libs.showkase)
ksp(libs.showkase.processor)
}
}