From 57b0dc003ee826e66e0cf42f36e6f7ddb1deada4 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Sat, 30 Jul 2022 16:07:10 +0200 Subject: [PATCH] Fix build versions --- BlueMapCore/build.gradle.kts | 1 + implementations/cli/build.gradle.kts | 5 ++--- implementations/fabric-1.15.2/build.gradle.kts | 5 ++--- implementations/fabric-1.16.1/build.gradle.kts | 5 ++--- implementations/fabric-1.16.2/build.gradle.kts | 5 ++--- implementations/fabric-1.17/build.gradle.kts | 5 ++--- implementations/fabric-1.18/build.gradle.kts | 5 ++--- implementations/fabric-1.19/build.gradle.kts | 5 ++--- implementations/forge-1.14.4/build.gradle | 5 ++--- implementations/forge-1.15.2/build.gradle | 5 ++--- implementations/forge-1.16.2/build.gradle | 5 ++--- implementations/forge-1.17.1/build.gradle | 5 ++--- implementations/forge-1.18.1/build.gradle | 5 ++--- implementations/forge-1.19/build.gradle | 4 ++-- implementations/spigot/build.gradle.kts | 5 ++--- implementations/sponge-8.0.0/build.gradle.kts | 5 ++--- 16 files changed, 31 insertions(+), 44 deletions(-) diff --git a/BlueMapCore/build.gradle.kts b/BlueMapCore/build.gradle.kts index bca4785b..1c5b23ef 100644 --- a/BlueMapCore/build.gradle.kts +++ b/BlueMapCore/build.gradle.kts @@ -92,6 +92,7 @@ tasks.test { } tasks.processResources { + outputs.upToDateWhen { false } from("src/main/resources") { include("de/bluecolored/bluemap/version.json") duplicatesStrategy = DuplicatesStrategy.INCLUDE diff --git a/implementations/cli/build.gradle.kts b/implementations/cli/build.gradle.kts index 26d237ea..1e00a9ce 100644 --- a/implementations/cli/build.gradle.kts +++ b/implementations/cli/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "de.bluecolored.bluemap.cli" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 11 java { @@ -70,9 +70,8 @@ tasks.jar { } tasks.shadowJar { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") //relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it relocate ("com.google", "de.bluecolored.shadow.google") diff --git a/implementations/fabric-1.15.2/build.gradle.kts b/implementations/fabric-1.15.2/build.gradle.kts index 16186e79..99d805e6 100644 --- a/implementations/fabric-1.15.2/build.gradle.kts +++ b/implementations/fabric-1.15.2/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.fabric" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 11 java { @@ -118,9 +118,8 @@ tasks.shadowJar { } tasks.register("remappedShadowJar", type = RemapJarTask::class) { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") dependsOn (tasks.shadowJar) inputFile.set(tasks.shadowJar.get().archiveFile) addNestedDependencies.set(true) diff --git a/implementations/fabric-1.16.1/build.gradle.kts b/implementations/fabric-1.16.1/build.gradle.kts index a19c61bb..f143c1a4 100644 --- a/implementations/fabric-1.16.1/build.gradle.kts +++ b/implementations/fabric-1.16.1/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.fabric" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 11 java { @@ -118,9 +118,8 @@ tasks.shadowJar { } tasks.register("remappedShadowJar", type = RemapJarTask::class) { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") dependsOn (tasks.shadowJar) inputFile.set(tasks.shadowJar.get().archiveFile) addNestedDependencies.set(true) diff --git a/implementations/fabric-1.16.2/build.gradle.kts b/implementations/fabric-1.16.2/build.gradle.kts index 9c4f8346..b735a07c 100644 --- a/implementations/fabric-1.16.2/build.gradle.kts +++ b/implementations/fabric-1.16.2/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.fabric" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 11 java { @@ -118,9 +118,8 @@ tasks.shadowJar { } tasks.register("remappedShadowJar", type = RemapJarTask::class) { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") dependsOn (tasks.shadowJar) inputFile.set(tasks.shadowJar.get().archiveFile) addNestedDependencies.set(true) diff --git a/implementations/fabric-1.17/build.gradle.kts b/implementations/fabric-1.17/build.gradle.kts index 165d50a2..aecc39c1 100644 --- a/implementations/fabric-1.17/build.gradle.kts +++ b/implementations/fabric-1.17/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.fabric" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 16 java { @@ -118,9 +118,8 @@ tasks.shadowJar { } tasks.register("remappedShadowJar", type = RemapJarTask::class) { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") dependsOn (tasks.shadowJar) inputFile.set(tasks.shadowJar.get().archiveFile) addNestedDependencies.set(true) diff --git a/implementations/fabric-1.18/build.gradle.kts b/implementations/fabric-1.18/build.gradle.kts index 1fe681c4..ccf132d3 100644 --- a/implementations/fabric-1.18/build.gradle.kts +++ b/implementations/fabric-1.18/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.fabric" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 17 java { @@ -118,9 +118,8 @@ tasks.shadowJar { } tasks.register("remappedShadowJar", type = RemapJarTask::class) { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") dependsOn (tasks.shadowJar) inputFile.set(tasks.shadowJar.get().archiveFile) addNestedDependencies.set(true) diff --git a/implementations/fabric-1.19/build.gradle.kts b/implementations/fabric-1.19/build.gradle.kts index e268f0c9..5a6bd3ea 100644 --- a/implementations/fabric-1.19/build.gradle.kts +++ b/implementations/fabric-1.19/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.fabric" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 17 java { @@ -118,9 +118,8 @@ tasks.shadowJar { } tasks.register("remappedShadowJar", type = RemapJarTask::class) { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") dependsOn (tasks.shadowJar) inputFile.set(tasks.shadowJar.get().archiveFile) addNestedDependencies.set(true) diff --git a/implementations/forge-1.14.4/build.gradle b/implementations/forge-1.14.4/build.gradle index e94a5b48..e866ab3d 100644 --- a/implementations/forge-1.14.4/build.gradle +++ b/implementations/forge-1.14.4/build.gradle @@ -20,7 +20,7 @@ plugins { apply plugin: "net.minecraftforge.gradle" group = "de.bluecolored.bluemap.forge" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore archivesBaseName = 'bluemap' def javaTarget = 11 @@ -119,9 +119,8 @@ test { } shadowJar { - def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") configurations = [project.configurations.shadowInclude] diff --git a/implementations/forge-1.15.2/build.gradle b/implementations/forge-1.15.2/build.gradle index 2eac6b55..1532610b 100644 --- a/implementations/forge-1.15.2/build.gradle +++ b/implementations/forge-1.15.2/build.gradle @@ -20,7 +20,7 @@ plugins { apply plugin: "net.minecraftforge.gradle" group = "de.bluecolored.bluemap.forge" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore archivesBaseName = 'bluemap' def javaTarget = 11 @@ -119,9 +119,8 @@ test { } shadowJar { - def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") configurations = [project.configurations.shadowInclude] diff --git a/implementations/forge-1.16.2/build.gradle b/implementations/forge-1.16.2/build.gradle index 295dfb33..5928100b 100644 --- a/implementations/forge-1.16.2/build.gradle +++ b/implementations/forge-1.16.2/build.gradle @@ -20,7 +20,7 @@ plugins { apply plugin: "net.minecraftforge.gradle" group = "de.bluecolored.bluemap.forge" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore archivesBaseName = 'bluemap' def javaTarget = 11 @@ -119,9 +119,8 @@ test { } shadowJar { - def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") configurations = [project.configurations.shadowInclude] diff --git a/implementations/forge-1.17.1/build.gradle b/implementations/forge-1.17.1/build.gradle index d66c3905..b41e03dc 100644 --- a/implementations/forge-1.17.1/build.gradle +++ b/implementations/forge-1.17.1/build.gradle @@ -20,7 +20,7 @@ plugins { apply plugin: "net.minecraftforge.gradle" group = "de.bluecolored.bluemap.forge" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore archivesBaseName = 'bluemap' def javaTarget = 16 @@ -119,9 +119,8 @@ test { } shadowJar { - def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") configurations = [project.configurations.shadowInclude] diff --git a/implementations/forge-1.18.1/build.gradle b/implementations/forge-1.18.1/build.gradle index 7b911b89..ee2d3563 100644 --- a/implementations/forge-1.18.1/build.gradle +++ b/implementations/forge-1.18.1/build.gradle @@ -20,7 +20,7 @@ plugins { apply plugin: "net.minecraftforge.gradle" group = "de.bluecolored.bluemap.forge" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore archivesBaseName = 'bluemap' def javaTarget = 17 @@ -119,9 +119,8 @@ test { } shadowJar { - def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") configurations = [project.configurations.shadowInclude] diff --git a/implementations/forge-1.19/build.gradle b/implementations/forge-1.19/build.gradle index 1b1eee69..dcadc099 100644 --- a/implementations/forge-1.19/build.gradle +++ b/implementations/forge-1.19/build.gradle @@ -20,7 +20,7 @@ plugins { apply plugin: "net.minecraftforge.gradle" group = "de.bluecolored.bluemap.forge" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore archivesBaseName = 'bluemap' def javaTarget = 17 @@ -121,7 +121,7 @@ test { shadowJar { def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") configurations = [project.configurations.shadowInclude] diff --git a/implementations/spigot/build.gradle.kts b/implementations/spigot/build.gradle.kts index 72057b42..5513a42e 100644 --- a/implementations/spigot/build.gradle.kts +++ b/implementations/spigot/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "de.bluecolored.bluemap.bukkit" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 11 java { @@ -85,9 +85,8 @@ tasks.processResources { } tasks.shadowJar { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") //relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config") diff --git a/implementations/sponge-8.0.0/build.gradle.kts b/implementations/sponge-8.0.0/build.gradle.kts index 3148f6d3..ffdbabbe 100644 --- a/implementations/sponge-8.0.0/build.gradle.kts +++ b/implementations/sponge-8.0.0/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "de.bluecolored.bluemap.bukkit" -version = "0.0.0" +version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore val javaTarget = 16 java { @@ -102,9 +102,8 @@ tasks.processResources { } tasks.shadowJar { - val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${version}-${project.name}.jar") + archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") //relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")