From 5b7d4c9ce6004c666d66c2daa40d35d48f3108dc Mon Sep 17 00:00:00 2001 From: HLCaptain Date: Sat, 18 Nov 2023 17:13:58 +0100 Subject: [PATCH] Dependency upgrade, version change. --- planty-client/android/build.gradle.kts | 7 ++----- planty-client/common/build.gradle.kts | 3 ++- planty-client/desktop/build.gradle.kts | 1 + planty-client/gradle/libs.versions.toml | 2 +- planty-client/web/build.gradle.kts | 4 +++- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/planty-client/android/build.gradle.kts b/planty-client/android/build.gradle.kts index 2e54719..15585ec 100644 --- a/planty-client/android/build.gradle.kts +++ b/planty-client/android/build.gradle.kts @@ -8,9 +8,6 @@ plugins { alias(libs.plugins.google.services) } -group = "nest" -version = "1.0-SNAPSHOT" - repositories { mavenCentral() } @@ -50,8 +47,8 @@ android { applicationId = "nest.planty" minSdk = 21 targetSdk = 34 - versionCode = 1 - versionName = "1.0-SNAPSHOT" + versionCode = 2 + versionName = project.version.toString() } buildTypes { getByName("release") { diff --git a/planty-client/common/build.gradle.kts b/planty-client/common/build.gradle.kts index 0f7eac0..1e81c94 100644 --- a/planty-client/common/build.gradle.kts +++ b/planty-client/common/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } group = "nest" -version = "1.0-SNAPSHOT" +version = "0.1.1-alpha" kotlin { jvmToolchain(17) @@ -135,6 +135,7 @@ android { defaultConfig { minSdk = 21 } + version = project.version.toString() } sqldelight { diff --git a/planty-client/desktop/build.gradle.kts b/planty-client/desktop/build.gradle.kts index 8f8aaef..4a6a648 100644 --- a/planty-client/desktop/build.gradle.kts +++ b/planty-client/desktop/build.gradle.kts @@ -12,4 +12,5 @@ dependencies { application { mainClass = "nest.planty.MainKt" + version = project.version.toString() } diff --git a/planty-client/gradle/libs.versions.toml b/planty-client/gradle/libs.versions.toml index 405a59c..3a412ab 100644 --- a/planty-client/gradle/libs.versions.toml +++ b/planty-client/gradle/libs.versions.toml @@ -56,7 +56,7 @@ voyager-koin = { module = "cafe.adriel.voyager:voyager-koin", version.ref = "voy androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" } androidx-core = { module = "androidx.core:core-ktx", version = "1.12.0" } -androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.0" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.1" } sqldelight-jvm = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" } sqldelight-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" } diff --git a/planty-client/web/build.gradle.kts b/planty-client/web/build.gradle.kts index 1065a7e..71c2421 100644 --- a/planty-client/web/build.gradle.kts +++ b/planty-client/web/build.gradle.kts @@ -23,5 +23,7 @@ kotlin { } compose.experimental { - web.application {} + web.application { + version = project.version.toString() + } }