From 0e69024cb20b7f135be264d4d0cc04d0640fd388 Mon Sep 17 00:00:00 2001 From: Sascha Lisson Date: Mon, 27 Jan 2025 09:58:33 +0100 Subject: [PATCH] ci: use version from tag --- build.gradle.kts | 18 +----------------- gradle/libs.versions.toml | 1 - 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1884ccf..776e55f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,27 +5,11 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin plugins { alias(libs.plugins.kotlin.jvm) apply false - alias(libs.plugins.gitVersion) } -version = computeVersion() +version = file("version.txt").takeIf { it.exists() }?.readText()?.trim() ?: "0.0.1-SNAPSHOT" println("Version: $version") -fun computeVersion(): Any { - val versionFile = file("version.txt") - val gitVersion: groovy.lang.Closure by extra - return if (versionFile.exists()) { - versionFile.readText().trim() - } else { - gitVersion() - // Avoid duplicated "-SNAPSHOT" ending - .let { if (it.endsWith("-SNAPSHOT")) it else "$it-SNAPSHOT" } - // Normalize the version so that is always a valid NPM version. - .let { if (it.matches("""\d+\.\d+.\d+-.*""".toRegex())) it else "0.0.1-$it" } - .also { versionFile.writeText(it) } - } -} - allprojects { repositories { maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 00b832d..02c9938 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,4 +9,3 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.0.21" } shadow = { id = "com.gradleup.shadow", version = "9.0.0-beta6" } binaryCompatibility = { id ="org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" } -gitVersion = { id = "com.palantir.git-version", version = "3.1.0" }