From aadac8551e49939e090aa06e4c5d276d5b964633 Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Fri, 22 Nov 2024 17:52:51 +0100 Subject: [PATCH] Get rid of libs.versions.toml --- app/build.gradle.kts | 39 ++++++++++++++++++++------------------- gradle/libs.versions.toml | 39 --------------------------------------- 2 files changed, 20 insertions(+), 58 deletions(-) delete mode 100644 gradle/libs.versions.toml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ec45c51..f29eafc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,7 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.FileInputStream import java.util.Properties +import org.gradle.kotlin.dsl.android +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -8,10 +9,10 @@ val keystoreProperties = Properties () keystoreProperties . load ( FileInputStream ( rootProject . file ("keystore.properties") ) ) plugins { - alias ( libs . plugins . android . application ) - alias ( libs . plugins . kotlin . android ) - alias ( libs . plugins . kotlin . compose ) - alias ( libs . plugins . kotlin . serialization ) + id ("com.android.application") . version ("8.7.2") + id ("org.jetbrains.kotlin.android") . version ("2.0.0") + id ("org.jetbrains.kotlin.plugin.compose") . version ("2.0.0") + id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.0.0") } android { @@ -57,21 +58,21 @@ android { } dependencies { - // Runtime libraries - implementation ( libs . android . material ) - implementation ( libs . androidx . activity . compose ) - implementation ( libs . androidx . core . ktx ) - implementation ( libs . androidx . compose . material3 ) - implementation ( libs . androidx . compose . ui ) - implementation ( libs . androidx . compose . ui . graphics ) - debugImplementation ( libs . androidx . compose . ui . tooling ) - implementation ( libs . androidx . datastore . preferences ) - implementation ( libs . androidx . lifecycle . runtime . ktx ) - implementation ( libs . kotlinx . coroutines . android ) - implementation ( libs . kotlinx . serialization . json ) + // Android runtime libraries + implementation ( "com.google.android.material" , "material" , "1.12.0" ) + implementation ( "androidx.activity" , "activity-compose" , "1.9.3" ) + implementation ( "androidx.core" , "core-ktx" , "1.13.1" ) + implementation ( "androidx.compose.material3" , "material3" , "1.3.1" ) + implementation ( "androidx.compose.ui" , "ui" , "1.7.5" ) + implementation ( "androidx.compose.ui" , "ui-graphics" , "1.7.5" ) + debugImplementation ( "androidx.compose.ui" , "ui-tooling" , "1.7.5" ) + implementation ( "androidx.datastore" , "datastore-preferences" , "1.1.1" ) + implementation ( "androidx.lifecycle" , "lifecycle-runtime-ktx" , "2.8.7" ) + implementation ( "org.jetbrains.kotlinx" , "kotlinx-coroutines-android" , "1.9.0" ) + implementation ( "org.jetbrains.kotlinx" , "kotlinx-serialization-json" , "1.7.3" ) // Other libraries - implementation ( libs . kmqtt . common ) - implementation ( libs . kmqtt . client ) + implementation ( "io.github.davidepianca98" , "kmqtt-common" , "0.4.8" ) + implementation ( "io.github.davidepianca98" , "kmqtt-client" , "0.4.8" ) } tasks . withType ( KotlinCompile :: class ) . all { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index 1b7404d..0000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,39 +0,0 @@ -[versions] -# Gradle plugins -android-plugin = "8.7.2" -kotlin = "2.0.0" -# Runtime libraries -android-material = "1.12.0" -androidx-activity-compose = "1.9.3" -androidx-compose-material3 = "1.3.1" -androidx-compose-ui = "1.7.5" -androidx-core-ktx = "1.13.1" -androidx-datastore-preferences = "1.1.1" -androidx-lifecycle-runtime-ktx = "2.8.7" -kotlinx-coroutines-android = "1.9.0" -kotlinx-serialization-json = "1.7.3" -# Other libraries -kmqtt = "0.4.8" - -[libraries] -# Runtime libraries -android-material = { group = "com.google.android.material", name = "material", version.ref = "android-material" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity-compose" } -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" } -androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" } -androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose-ui" } -androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "androidx-compose-ui" } -androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose-ui" } -androidx-datastore-preferences = { group = "androidx.datastore" , name = "datastore-preferences" , version.ref = "androidx-datastore-preferences" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime-ktx" } -kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines-android" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" } -# Other libraries -kmqtt-common = { group = "io.github.davidepianca98", name = "kmqtt-common", version.ref = "kmqtt" } -kmqtt-client = { group = "io.github.davidepianca98", name = "kmqtt-client", version.ref = "kmqtt" } - -[plugins] -android-application = { id = "com.android.application", version.ref = "android-plugin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }