kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(deps): switch to Compose BOM

Browse source
This commit is contained in:
Harsh Shandilya 2022-10-25 18:28:45 +05:30
parent 53802dfa15
commit 0c939a2929
No known key found for this signature in database
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle.kts
View file

@ -32,7 +32,7 @@ android {
compose = true
composeOptions {
useLiveLiterals = false
kotlinCompilerExtensionVersion = libs.compose.compiler.get().versionConstraint.requiredVersion
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
}
@ -51,6 +51,7 @@ android {
}
dependencies {
implementation(platform(libs.compose.bom))
kapt(libs.dagger.hilt.compiler)
implementation(libs.androidx.annotation)
coreLibraryDesugaring(libs.android.desugarJdkLibs)

28
gradle/libs.versions.toml
View file

@ -3,8 +3,8 @@ agp = "7.3.1"
androidxActivity = "1.7.0-alpha02"
beagle = "2.9.0"
bouncycastle = "1.72"
composeFoundation = "1.3.0"
composeUi = "1.3.0"
# @keep used for kotlinCompilerExtensionVersion
composeCompiler = "1.3.2"
coroutines = "1.6.4"
flowbinding = "1.2.0"
hilt = "2.44"
@ -50,19 +50,19 @@ build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:
build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.7.0"
build-versions = "com.github.ben-manes:gradle-versions-plugin:0.43.0"
compose-animation = "androidx.compose.animation:animation:1.3.0"
compose-compiler = "androidx.compose.compiler:compiler:1.3.2"
compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" }
compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
compose-animation = { module = "androidx.compose.animation:animation" }
compose-bom = "androidx.compose:compose-bom:2022.10.00"
compose-foundation-core = { module = "androidx.compose.foundation:foundation" }
compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
compose-material = "androidx.compose.material:material:1.3.0"
compose-material3 = "androidx.compose.material3:material3:1.0.0"
compose-runtime = "androidx.compose.runtime:runtime:1.3.0"
compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "composeUi" }
compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeUi" }
compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeUi" }
compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "composeUi" }
compose-material = { module = "androidx.compose.material:material" }
compose-material3 = { module = "androidx.compose.material3:material3" }
compose-runtime = { module = "androidx.compose.runtime:runtime" }
compose-ui-core = { module = "androidx.compose.ui:ui" }
compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
compose-ui-util = { module = "androidx.compose.ui:ui-util" }
compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" }

1
settings.gradle.kts
View file

@ -133,6 +133,7 @@ dependencyResolutionManagement {
includeGroup("com.android.tools.layoutlib")
includeGroup("com.android.tools.lint")
includeGroup("com.google.android.gms")
includeModule("androidx.compose", "compose-bom")
includeModule("com.android.tools", "annotations")
includeModule("com.android.tools", "common")
includeModule("com.android.tools", "desugar_jdk_libs")

3
ui-compose/build.gradle.kts
View file

@ -15,13 +15,14 @@ android {
compose = true
composeOptions {
useLiveLiterals = false
kotlinCompilerExtensionVersion = libs.compose.compiler.get().versionConstraint.requiredVersion
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
}
namespace = "app.passwordstore.ui.compose"
}
dependencies {
api(platform(libs.compose.bom))
api(libs.compose.foundation.core)
api(libs.compose.foundation.layout)
api(libs.compose.material3)