From 3d43d107cafe4ce01d7effc205ccf19eb283f649 Mon Sep 17 00:00:00 2001 From: Thomas Creutzenberg Date: Wed, 31 Jul 2024 11:38:19 +0200 Subject: [PATCH] Fix game version in construo distribution --- src/main/kotlin/gdx/liftoff/data/files/gradle/RootGradleFile.kt | 2 +- src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt | 2 +- src/main/kotlin/gdx/liftoff/data/project/Project.kt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/gdx/liftoff/data/files/gradle/RootGradleFile.kt b/src/main/kotlin/gdx/liftoff/data/files/gradle/RootGradleFile.kt index aae6229f..ff8f8099 100644 --- a/src/main/kotlin/gdx/liftoff/data/files/gradle/RootGradleFile.kt +++ b/src/main/kotlin/gdx/liftoff/data/files/gradle/RootGradleFile.kt @@ -84,7 +84,7 @@ ${plugins.joinToString(separator = "\n") { " apply plugin: '$it'" }} } subprojects { - version = '${project.advanced.version}' + version = '${'$'}gameVersion' ext.appName = '${project.basic.name}' repositories { mavenCentral() diff --git a/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt b/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt index 502a46ef..5184c79b 100644 --- a/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt +++ b/src/main/kotlin/gdx/liftoff/data/platforms/Lwjgl3.kt @@ -214,7 +214,7 @@ construo { // human-readable name, used for example in the `.app` name for macOS humanName.set(appName) // Optional, defaults to project version - version.set("0.0.0") + version.set('${'$'}gameVersion') targets.configure { create("linuxX64", Target.Linux) { diff --git a/src/main/kotlin/gdx/liftoff/data/project/Project.kt b/src/main/kotlin/gdx/liftoff/data/project/Project.kt index aa43a963..747cf3c1 100644 --- a/src/main/kotlin/gdx/liftoff/data/project/Project.kt +++ b/src/main/kotlin/gdx/liftoff/data/project/Project.kt @@ -144,6 +144,7 @@ class Project( private fun saveProperties() { // Adding libGDX version property: properties["gdxVersion"] = advanced.gdxVersion + properties["gameVersion"] = advanced.version PropertiesFile(properties).save(basic.destination) }