use version catalogs

This commit is contained in:
greenart7c3
2024-04-12 08:40:42 -03:00
parent 56e7eaf8f1
commit ffeba6bcdc
4 changed files with 103 additions and 47 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.9.22" />
<option name="version" value="1.9.23" />
</component>
</project>
+38 -36
View File
@@ -90,63 +90,65 @@ android {
}
dependencies {
implementation('com.github.vitorpamplona.amethyst:quartz:v0.86.2') {
implementation(libs.quartz) {
exclude group: 'net.java.dev.jna'
}
implementation 'net.java.dev.jna:jna:5.14.0@aar'
implementation "androidx.core:core-splashscreen:1.0.1"
implementation(libs.jna) {
artifact { type = "aar" }
}
implementation libs.core.splashscreen
implementation "androidx.core:core-ktx:$core_ktx_version"
implementation 'androidx.activity:activity-compose:1.8.2'
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
implementation libs.core.ktx
implementation libs.activity.compose
implementation libs.ui
implementation libs.ui.tooling.preview
implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
implementation libs.runtime.livedata
// Navigation
implementation "androidx.navigation:navigation-compose:$nav_version"
implementation libs.navigation.compose
// Observe Live data as State
implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
implementation libs.runtime.livedata
implementation "androidx.compose.material3:material3:1.2.1"
implementation "androidx.compose.material:material-icons-extended:$compose_ui_version"
implementation libs.material3
implementation libs.material.icons.extended
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation libs.appcompat
testImplementation 'junit:junit:4.13.2'
testImplementation 'io.mockk:mockk:1.13.10'
androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha03'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
testImplementation libs.junit
testImplementation libs.mockk
androidTestImplementation libs.ext.junit
androidTestImplementation libs.espresso.core
androidTestImplementation libs.ui.test.junit4
debugImplementation libs.ui.tooling
debugImplementation libs.ui.test.manifest
implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
implementation libs.security.crypto.ktx
// Lifecycle
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation libs.lifecycle.runtime.compose
implementation libs.lifecycle.viewmodel.compose
implementation libs.lifecycle.runtime.ktx
// For QR generation
implementation 'com.google.zxing:core:3.5.3'
implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
implementation libs.core
implementation libs.zxing.android.embedded
// Json Serialization
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation libs.converter.gson
// Markdown (With fix for full-image bleeds)
implementation('com.github.vitorpamplona.compose-richtext:richtext-ui:48702a8ced')
implementation('com.github.vitorpamplona.compose-richtext:richtext-ui-material3:48702a8ced')
implementation('com.github.vitorpamplona.compose-richtext:richtext-commonmark:48702a8ced')
implementation(libs.richtext.ui)
implementation(libs.richtext.ui.material3)
implementation(libs.richtext.commonmark)
// Biometrics
implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
implementation libs.biometric.ktx
playImplementation platform('com.google.firebase:firebase-bom:32.8.0')
playImplementation('com.google.firebase:firebase-messaging:23.4.1')
freeImplementation('com.github.UnifiedPush:android-connector:2.2.0')
ksp("androidx.room:room-compiler:$room_version")
implementation("androidx.room:room-ktx:$room_version")
playImplementation platform(libs.firebase.bom)
playImplementation(libs.firebase.messaging)
freeImplementation(libs.android.connector)
ksp(libs.room.compiler)
implementation(libs.room.ktx)
}
-10
View File
@@ -1,15 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript {
ext {
lifecycle_version = '2.7.0'
compose_ui_version = '1.6.5'
nav_version = "2.7.7"
core_ktx_version = '1.12.0'
room_version = "2.6.1"
}
}
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.3.2' apply false
+64
View File
@@ -0,0 +1,64 @@
[versions]
activityCompose = "1.8.2"
androidConnector = "2.2.0"
appcompat = "1.6.1"
biometricKtx = "1.2.0-alpha05"
converterGson = "2.9.0"
core = "3.5.3"
coreKtx = "1.12.0"
coreSplashscreen = "1.0.1"
espressoCore = "3.5.1"
firebaseBom = "32.8.0"
firebaseMessaging = "23.4.1"
jna = "5.14.0"
junit = "4.13.2"
junitVersion = "1.2.0-alpha03"
lifecycle_version = "2.7.0"
material3 = "1.2.1"
mockk = "1.13.10"
nav_version = "2.7.7"
quartz = "v0.86.2"
compose_ui = "1.6.5"
richtextUi = "48702a8ced"
roomKtx = "2.6.1"
securityCryptoKtx = "1.1.0-alpha06"
zxingAndroidEmbedded = "4.3.0"
[libraries]
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
android-connector = { module = "com.github.UnifiedPush:android-connector", version.ref = "androidConnector" }
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
biometric-ktx = { module = "androidx.biometric:biometric-ktx", version.ref = "biometricKtx" }
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converterGson" }
core = { module = "com.google.zxing:core", version.ref = "core" }
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebaseMessaging" }
jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
junit = { module = "junit:junit", version.ref = "junit" }
lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle_version" }
lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle_version" }
lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle_version" }
material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose_ui" }
material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "nav_version" }
quartz = { module = "com.github.vitorpamplona.amethyst:quartz", version.ref = "quartz" }
richtext-commonmark = { module = "com.github.vitorpamplona.compose-richtext:richtext-commonmark", version.ref = "richtextUi" }
richtext-ui = { module = "com.github.vitorpamplona.compose-richtext:richtext-ui", version.ref = "richtextUi" }
richtext-ui-material3 = { module = "com.github.vitorpamplona.compose-richtext:richtext-ui-material3", version.ref = "richtextUi" }
room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomKtx" }
room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomKtx" }
runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose_ui" }
security-crypto-ktx = { module = "androidx.security:security-crypto-ktx", version.ref = "securityCryptoKtx" }
ui = { module = "androidx.compose.ui:ui", version.ref = "compose_ui" }
ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose_ui" }
ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose_ui" }
ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose_ui" }
ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose_ui" }
zxing-android-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxingAndroidEmbedded" }
[plugins]