Fix build versions

This commit is contained in:
Lukas Rieger (Blue) 2022-07-30 16:07:10 +02:00
parent be04097ec5
commit 57b0dc003e
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
16 changed files with 31 additions and 44 deletions

View File

@ -92,6 +92,7 @@ tasks.test {
} }
tasks.processResources { tasks.processResources {
outputs.upToDateWhen { false }
from("src/main/resources") { from("src/main/resources") {
include("de/bluecolored/bluemap/version.json") include("de/bluecolored/bluemap/version.json")
duplicatesStrategy = DuplicatesStrategy.INCLUDE duplicatesStrategy = DuplicatesStrategy.INCLUDE

View File

@ -7,7 +7,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.cli" group = "de.bluecolored.bluemap.cli"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11 val javaTarget = 11
java { java {
@ -70,9 +70,8 @@ tasks.jar {
} }
tasks.shadowJar { tasks.shadowJar {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) 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.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
relocate ("com.google", "de.bluecolored.shadow.google") relocate ("com.google", "de.bluecolored.shadow.google")

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.fabric" group = "de.bluecolored.bluemap.fabric"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11 val javaTarget = 11
java { java {
@ -118,9 +118,8 @@ tasks.shadowJar {
} }
tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("remappedShadowJar", type = RemapJarTask::class) {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
dependsOn (tasks.shadowJar) dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile) inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true) addNestedDependencies.set(true)

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.fabric" group = "de.bluecolored.bluemap.fabric"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11 val javaTarget = 11
java { java {
@ -118,9 +118,8 @@ tasks.shadowJar {
} }
tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("remappedShadowJar", type = RemapJarTask::class) {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
dependsOn (tasks.shadowJar) dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile) inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true) addNestedDependencies.set(true)

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.fabric" group = "de.bluecolored.bluemap.fabric"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11 val javaTarget = 11
java { java {
@ -118,9 +118,8 @@ tasks.shadowJar {
} }
tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("remappedShadowJar", type = RemapJarTask::class) {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
dependsOn (tasks.shadowJar) dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile) inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true) addNestedDependencies.set(true)

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.fabric" group = "de.bluecolored.bluemap.fabric"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 16 val javaTarget = 16
java { java {
@ -118,9 +118,8 @@ tasks.shadowJar {
} }
tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("remappedShadowJar", type = RemapJarTask::class) {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
dependsOn (tasks.shadowJar) dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile) inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true) addNestedDependencies.set(true)

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.fabric" group = "de.bluecolored.bluemap.fabric"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 17 val javaTarget = 17
java { java {
@ -118,9 +118,8 @@ tasks.shadowJar {
} }
tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("remappedShadowJar", type = RemapJarTask::class) {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
dependsOn (tasks.shadowJar) dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile) inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true) addNestedDependencies.set(true)

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.fabric" group = "de.bluecolored.bluemap.fabric"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 17 val javaTarget = 17
java { java {
@ -118,9 +118,8 @@ tasks.shadowJar {
} }
tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("remappedShadowJar", type = RemapJarTask::class) {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
dependsOn (tasks.shadowJar) dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile) inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true) addNestedDependencies.set(true)

View File

@ -20,7 +20,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle" apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap.forge" group = "de.bluecolored.bluemap.forge"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap' archivesBaseName = 'bluemap'
def javaTarget = 11 def javaTarget = 11
@ -119,9 +119,8 @@ test {
} }
shadowJar { shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude] configurations = [project.configurations.shadowInclude]

View File

@ -20,7 +20,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle" apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap.forge" group = "de.bluecolored.bluemap.forge"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap' archivesBaseName = 'bluemap'
def javaTarget = 11 def javaTarget = 11
@ -119,9 +119,8 @@ test {
} }
shadowJar { shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude] configurations = [project.configurations.shadowInclude]

View File

@ -20,7 +20,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle" apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap.forge" group = "de.bluecolored.bluemap.forge"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap' archivesBaseName = 'bluemap'
def javaTarget = 11 def javaTarget = 11
@ -119,9 +119,8 @@ test {
} }
shadowJar { shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude] configurations = [project.configurations.shadowInclude]

View File

@ -20,7 +20,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle" apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap.forge" group = "de.bluecolored.bluemap.forge"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap' archivesBaseName = 'bluemap'
def javaTarget = 16 def javaTarget = 16
@ -119,9 +119,8 @@ test {
} }
shadowJar { shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude] configurations = [project.configurations.shadowInclude]

View File

@ -20,7 +20,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle" apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap.forge" group = "de.bluecolored.bluemap.forge"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap' archivesBaseName = 'bluemap'
def javaTarget = 17 def javaTarget = 17
@ -119,9 +119,8 @@ test {
} }
shadowJar { shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude] configurations = [project.configurations.shadowInclude]

View File

@ -20,7 +20,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle" apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap.forge" group = "de.bluecolored.bluemap.forge"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap' archivesBaseName = 'bluemap'
def javaTarget = 17 def javaTarget = 17
@ -121,7 +121,7 @@ test {
shadowJar { shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${version}-${project.name}.jar") archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude] configurations = [project.configurations.shadowInclude]

View File

@ -7,7 +7,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.bukkit" group = "de.bluecolored.bluemap.bukkit"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11 val javaTarget = 11
java { java {
@ -85,9 +85,8 @@ tasks.processResources {
} }
tasks.shadowJar { tasks.shadowJar {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) 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.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") relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")

View File

@ -10,7 +10,7 @@ plugins {
} }
group = "de.bluecolored.bluemap.bukkit" group = "de.bluecolored.bluemap.bukkit"
version = "0.0.0" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 16 val javaTarget = 16
java { java {
@ -102,9 +102,8 @@ tasks.processResources {
} }
tasks.shadowJar { tasks.shadowJar {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release")) 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.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") relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")