From 366f425539376176482467b24d0464076b86cae9 Mon Sep 17 00:00:00 2001 From: nacabaro Date: Wed, 28 Jan 2026 02:05:43 +0100 Subject: [PATCH] Updated libraries Moved library definitions to the catalog, and updated the catalog --- app/build.gradle.kts | 43 ++++++++++++++++++++++++--------------- gradle/libs.versions.toml | 31 ++++++++++++++++++---------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 01387d5..0ff1234 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,19 +1,21 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) - id("com.google.devtools.ksp") version "2.0.21-1.0.27" + id("com.google.devtools.ksp") version "2.3.0" id("com.google.protobuf") } android { namespace = "com.github.nacabaro.vbhelper" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "com.github.nacabaro.vbhelper" minSdk = 28 - targetSdk = 35 + targetSdk = 36 versionCode = 1 versionName = "Alpha 0.6.3" @@ -33,9 +35,7 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } + buildFeatures { compose = true } @@ -45,6 +45,12 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_11 + } +} + protobuf { protoc { artifact = "com.google.protobuf:protoc:4.27.0" @@ -68,10 +74,13 @@ dependencies { implementation(libs.androidx.room.runtime) implementation(libs.vb.nfc.reader) implementation(libs.dim.reader) - ksp(libs.androidx.room.compiler) - annotationProcessor(libs.androidx.room.compiler) implementation(libs.androidx.core.ktx) - implementation("androidx.room:room-ktx:2.6.1") + implementation(libs.androidx.room.ktx) + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.navigation.compose) + implementation(libs.material) + implementation(libs.protobuf.javalite) + implementation(libs.androidx.compose.material) implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) implementation(platform(libs.androidx.compose.bom)) @@ -80,16 +89,18 @@ dependencies { implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + implementation(libs.androidx.compose.material.icons.extended) + + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + testImplementation(libs.junit) + + ksp(libs.androidx.room.compiler) + annotationProcessor(libs.androidx.room.compiler) + androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) androidTestImplementation(platform(libs.androidx.compose.bom)) androidTestImplementation(libs.androidx.ui.test.junit4) - debugImplementation(libs.androidx.ui.tooling) - debugImplementation(libs.androidx.ui.test.manifest) - implementation("androidx.navigation:navigation-compose:2.7.0") - implementation("com.google.android.material:material:1.2.0") - implementation(libs.protobuf.javalite) - implementation("androidx.compose.material:material") - implementation("androidx.datastore:datastore-preferences:1.1.7") } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94c3f7d..7e4875e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,24 +1,32 @@ [versions] agp = "8.13.2" -datastore = "1.1.2" -kotlin = "2.0.0" -coreKtx = "1.15.0" +datastore = "1.2.0" +datastorePreferences = "1.2.0" +kotlin = "2.3.0" +coreKtx = "1.17.0" junit = "4.13.2" -junitVersion = "1.2.1" -espressoCore = "3.6.1" -lifecycleRuntimeKtx = "2.8.7" -activityCompose = "1.10.0" -composeBom = "2025.01.00" -protobufGradlePlugin = "0.9.4" -protobufJavalite = "4.27.0" -roomRuntime = "2.6.1" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +lifecycleRuntimeKtx = "2.10.0" +activityCompose = "1.12.2" +composeBom = "2026.01.00" +material = "1.13.0" +navigationCompose = "2.9.6" +protobufGradlePlugin = "0.9.6" +protobufJavalite = "4.33.4" +roomRuntime = "2.8.4" vbNfcReader = "0.2.0-SNAPSHOT" dimReader = "2.1.0" [libraries] +androidx-compose-material = { module = "androidx.compose.material:material" } +androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" } +androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomRuntime" } +androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomRuntime" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomRuntime" } junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } @@ -33,6 +41,7 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +material = { module = "com.google.android.material:material", version.ref = "material" } protobuf-gradle-plugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobufGradlePlugin" } protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobufJavalite" } vb-nfc-reader = { module = "com.github.cfogrady:vb-nfc-reader", version.ref = "vbNfcReader" }