From 96c45c8662c1207ce21ee21a0fc07df2d52ac5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Miguel=20Rubio?= Date: Thu, 30 May 2024 09:49:17 +0200 Subject: [PATCH] ci: [ANDROAPP-6188] Move group project to root (#249) --- build.gradle.kts | 10 +++++++++- designsystem/build.gradle.kts | 12 ++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 13edc4c64..db9e92d39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - +version = "0.3.0-SNAPSHOT" group = "org.hisp.dhis.mobile" plugins { @@ -13,6 +13,14 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "1.3.0" } +/** + * Property from the Gradle command line. To remove the snapshot suffix from the version. + */ +if (project.hasProperty("removeSnapshotSuffix")) { + val mainVersion = (version as String).split("-SNAPSHOT")[0] + version = mainVersion +} + allprojects { apply(plugin = "org.jlleitschuh.gradle.ktlint") ktlint { diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts index d9a8deba4..2ae311c0a 100644 --- a/designsystem/build.gradle.kts +++ b/designsystem/build.gradle.kts @@ -1,5 +1,5 @@ -version = "0.3.0-SNAPSHOT" -group = "org.hisp.dhis.mobile" +version = rootProject.version +group = rootProject.group plugins { kotlin("multiplatform") @@ -9,14 +9,6 @@ plugins { id("app.cash.paparazzi").version("1.3.3") } -/** - * Property from the Gradle command line. To remove the snapshot suffix from the version. - */ -if (project.hasProperty("removeSnapshotSuffix")) { - val mainVersion = (version as String).split("-SNAPSHOT")[0] - version = mainVersion -} - kotlin { androidTarget { publishLibraryVariants("release")