Skip to content

Commit

Permalink
using conventions with their own versioning
Browse files Browse the repository at this point in the history
- removes android plugins and compose from the main app
  • Loading branch information
ouchadam committed Dec 12, 2022
1 parent c299d55 commit 259644a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 22 deletions.
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ dependencies {
implementation "chat-engine:matrix-chat-engine"
implementation "chat-engine.matrix:store"

implementation libs.compose.ui
implementation libs.ktor.android
implementation libs.sqldelight.android
implementation libs.matrix.olm
Expand Down
21 changes: 2 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,26 @@ kotlin = "1.7.20"
coroutines = "1.6.4"
sqldelight = "1.5.4"
ktor = "2.2.1"
compose = "1.2.1"
compose-compiler = "1.3.2"
android-gp = "7.3.1"

[plugins]

android-application = { id = "com.android.application", version.ref = "android-gp" }
android-library = { id = "com.android.library", version.ref = "android-gp" }
android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.2" }

kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.2" }
sqldelight = { id = "com.squareup.sqldelight", version.ref = "sqldelight" }

[libraries]

compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "compose" }
compose-material-three = { group = "androidx.compose.material3", name = "material3", version = "1.0.1" }
compose-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "compose" }
compose-activity = { group = "androidx.activity", name = "activity-compose", version = "1.6.1" }
compose-coil = { group = "io.coil-kt", name = "coil-compose", version = "2.2.2" }

android-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version = "1.1.5" }

compose-coil = { group = "io.coil-kt", name = "coil-compose", version = "2.2.2" }
accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version = "0.28.0" }

matrix-olm = { group = "org.matrix.android", name = "olm-sdk", version = "3.2.12" }

unifiedpush = { group = "com.github.UnifiedPush", name = "android-connector", version = "2.1.1" }

firebase-bom = { module = "com.google.firebase:firebase-bom", version = "31.1.1" }

kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.4.1" }

kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
kotlin-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pluginManagement {
includeBuild 'tools/conventions'
repositories {
gradlePluginPortal()
google()
Expand All @@ -14,7 +15,6 @@ rootProject.name = "SmallTalk"

includeBuild 'screen-state'
includeBuild 'chat-engine'
includeBuild 'tools/conventions'

include ':app'

Expand Down

0 comments on commit 259644a

Please sign in to comment.