From 4cdfbe56f18a82fd2a837e0e0c0aae300b9ec5d0 Mon Sep 17 00:00:00 2001 From: Jakob Ecker Date: Fri, 22 Mar 2024 16:52:26 +0100 Subject: [PATCH] Move setting version into desktop-app module --- build.gradle.kts | 2 -- conveyor.conf | 1 - desktop-app/build.gradle.kts | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 373eee4..c437b44 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,6 @@ plugins { alias(libs.plugins.detekt) } -version = System.getenv("RELEASE_VERSION") ?: "0.0.0" - val mergeSarif by tasks.registering(ReportMergeTask::class) { output = layout.buildDirectory.file("reports/detekt/merged.sarif") } diff --git a/conveyor.conf b/conveyor.conf index 923295c..cedcabc 100644 --- a/conveyor.conf +++ b/conveyor.conf @@ -7,7 +7,6 @@ app { linux.inputs += TASK/rendered-icons/linux windows.inputs += TASK/rendered-icons/windows - version = ${env.RELEASE_VERSION} vcs-url = github.com/recke96/HEMAtoma licence = EUPL-1.2 diff --git a/desktop-app/build.gradle.kts b/desktop-app/build.gradle.kts index 3755299..05c1664 100644 --- a/desktop-app/build.gradle.kts +++ b/desktop-app/build.gradle.kts @@ -5,6 +5,8 @@ plugins { alias(libs.plugins.conveyor) } +version = System.getenv("RELEASE_VERSION") ?: "0.0.0" + kotlin { jvmToolchain(21) }