Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finalize versioning changes further (hopefully i stay happy now with it)

This commit is contained in:
Lukas Rieger (Blue) 2022-07-27 15:10:23 +02:00
parent 55dbf38144
commit 484996a61c
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
16 changed files with 59 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BlueMapCore/build.gradle.kts
View File

@ -1,4 +1,3 @@
import java.util.Properties
import java.io.IOException
plugins {
@ -23,23 +22,17 @@ fun String.runCommand(): String = ProcessBuilder(split("\\s(?=(?:[^'\"`]*(['\"`]
val gitHash = "git rev-parse --verify HEAD".runCommand()
val clean = "git status --porcelain".runCommand().isEmpty()
val branch = "git rev-parse --abbrev-ref HEAD".runCommand()
val commitCount = "git rev-list --count HEAD".runCommand()
if (branch.isEmpty()) {
throw IllegalStateException("Could not determine branch name")
}
val lastTag = "git describe --tags --abbrev=0".runCommand()
val lastVersion = lastTag.substring(1) // remove the leading 'v'
val commits = "git rev-list --count $lastTag..HEAD".runCommand()
println("Git hash: $gitHash" + if (clean) "" else " (dirty)")
println("Branch: $branch")
val releaseProperties = Properties()
releaseProperties.load(file("../release.properties").inputStream())
group = "de.bluecolored.bluemap.core"
version = releaseProperties["version"].toString() + ".$commitCount" +
(if (clean) "" else ".dirty") +
(if (branch == "master") "" else "-$branch")
version = lastVersion +
(if (commits == "0") "" else "-$commits") +
(if (clean) "" else "-dirty")
System.setProperty("bluemap.version", version.toString())
println("Version: $version")
val javaTarget = 11

14
implementations/cli/build.gradle.kts
View File

@ -1,22 +1,13 @@
import java.util.Properties
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.cli"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 11
java {
@ -79,8 +70,9 @@ tasks.jar {
}
tasks.shadowJar {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${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")

13
implementations/fabric-1.15.2/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import net.fabricmc.loom.task.RemapJarTask
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("fabric-loom") version "0.12-SNAPSHOT"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.fabric"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 11
java {
@ -126,8 +118,9 @@ 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-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true)

13
implementations/fabric-1.16.1/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import net.fabricmc.loom.task.RemapJarTask
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("fabric-loom") version "0.12-SNAPSHOT"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.fabric"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 11
java {
@ -126,8 +118,9 @@ 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-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true)

13
implementations/fabric-1.16.2/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import net.fabricmc.loom.task.RemapJarTask
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("fabric-loom") version "0.12-SNAPSHOT"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.fabric"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 11
java {
@ -126,8 +118,9 @@ 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-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true)

13
implementations/fabric-1.17/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import net.fabricmc.loom.task.RemapJarTask
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("fabric-loom") version "0.12-SNAPSHOT"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.fabric"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 16
java {
@ -126,8 +118,9 @@ 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-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true)

13
implementations/fabric-1.18/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import net.fabricmc.loom.task.RemapJarTask
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("fabric-loom") version "0.12-SNAPSHOT"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.fabric"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 17
java {
@ -126,8 +118,9 @@ 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-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true)

13
implementations/fabric-1.19/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import net.fabricmc.loom.task.RemapJarTask
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("fabric-loom") version "0.12-SNAPSHOT"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.fabric"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 17
java {
@ -126,8 +118,9 @@ 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-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
dependsOn (tasks.shadowJar)
inputFile.set(tasks.shadowJar.get().archiveFile)
addNestedDependencies.set(true)

12
implementations/forge-1.14.4/build.gradle
View File

@ -13,20 +13,14 @@ plugins {
id "java"
id "java-library"
id "com.diffplug.spotless" version "6.1.2"
id "com.palantir.git-version" version "0.12.3"
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.johnrengelman.shadow" version "7.1.2"
}
apply plugin: "net.minecraftforge.gradle"
def git = versionDetails()
def releaseProperties = new Properties()
releaseProperties.load(new FileInputStream(file("../../release.properties")))
group = "de.bluecolored.bluemap.forge"
version = releaseProperties.version.toString()
version = "0.0.0"
archivesBaseName = 'bluemap'
def javaTarget = 11
@ -125,8 +119,10 @@ test {
}
shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude]
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it

12
implementations/forge-1.15.2/build.gradle
View File

@ -13,20 +13,14 @@ plugins {
id "java"
id "java-library"
id "com.diffplug.spotless" version "6.1.2"
id "com.palantir.git-version" version "0.12.3"
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.johnrengelman.shadow" version "7.1.2"
}
apply plugin: "net.minecraftforge.gradle"
def git = versionDetails()
def releaseProperties = new Properties()
releaseProperties.load(new FileInputStream(file("../../release.properties")))
group = "de.bluecolored.bluemap.forge"
version = releaseProperties.version.toString()
version = "0.0.0"
archivesBaseName = 'bluemap'
def javaTarget = 11
@ -125,8 +119,10 @@ test {
}
shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude]
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it

12
implementations/forge-1.16.2/build.gradle
View File

@ -13,20 +13,14 @@ plugins {
id "java"
id "java-library"
id "com.diffplug.spotless" version "6.1.2"
id "com.palantir.git-version" version "0.12.3"
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.johnrengelman.shadow" version "7.1.2"
}
apply plugin: "net.minecraftforge.gradle"
def git = versionDetails()
def releaseProperties = new Properties()
releaseProperties.load(new FileInputStream(file("../../release.properties")))
group = "de.bluecolored.bluemap.forge"
version = releaseProperties.version.toString()
version = "0.0.0"
archivesBaseName = 'bluemap'
def javaTarget = 11
@ -125,8 +119,10 @@ test {
}
shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude]
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it

12
implementations/forge-1.17.1/build.gradle
View File

@ -13,20 +13,14 @@ plugins {
id "java"
id "java-library"
id "com.diffplug.spotless" version "6.1.2"
id "com.palantir.git-version" version "0.12.3"
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.johnrengelman.shadow" version "7.1.2"
}
apply plugin: "net.minecraftforge.gradle"
def git = versionDetails()
def releaseProperties = new Properties()
releaseProperties.load(new FileInputStream(file("../../release.properties")))
group = "de.bluecolored.bluemap.forge"
version = releaseProperties.version.toString()
version = "0.0.0"
archivesBaseName = 'bluemap'
def javaTarget = 16
@ -125,8 +119,10 @@ test {
}
shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude]
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it

12
implementations/forge-1.18.1/build.gradle
View File

@ -13,20 +13,14 @@ plugins {
id "java"
id "java-library"
id "com.diffplug.spotless" version "6.1.2"
id "com.palantir.git-version" version "0.12.3"
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.johnrengelman.shadow" version "7.1.2"
}
apply plugin: "net.minecraftforge.gradle"
def git = versionDetails()
def releaseProperties = new Properties()
releaseProperties.load(new FileInputStream(file("../../release.properties")))
group = "de.bluecolored.bluemap.forge"
version = releaseProperties.version.toString()
version = "0.0.0"
archivesBaseName = 'bluemap'
def javaTarget = 17
@ -125,8 +119,10 @@ test {
}
shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude]
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it

12
implementations/forge-1.19/build.gradle
View File

@ -13,20 +13,14 @@ plugins {
id "java"
id "java-library"
id "com.diffplug.spotless" version "6.1.2"
id "com.palantir.git-version" version "0.12.3"
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.johnrengelman.shadow" version "7.1.2"
}
apply plugin: "net.minecraftforge.gradle"
def git = versionDetails()
def releaseProperties = new Properties()
releaseProperties.load(new FileInputStream(file("../../release.properties")))
group = "de.bluecolored.bluemap.forge"
version = releaseProperties.version.toString()
version = "0.0.0"
archivesBaseName = 'bluemap'
def javaTarget = 17
@ -125,8 +119,10 @@ test {
}
shadowJar {
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${version}-${project.name}.jar")
configurations = [project.configurations.shadowInclude]
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it

14
implementations/spigot/build.gradle.kts
View File

@ -1,22 +1,13 @@
import java.util.Properties
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.bukkit"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 11
java {
@ -94,8 +85,9 @@ tasks.processResources {
}
tasks.shadowJar {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${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")

13
implementations/sponge-8.0.0/build.gradle.kts
View File

@ -1,24 +1,16 @@
import java.util.Properties
import org.spongepowered.gradle.plugin.config.PluginLoaders
plugins {
java
`java-library`
id("com.diffplug.spotless") version "6.1.2"
id ("com.palantir.git-version") version "0.12.3"
id ("com.github.node-gradle.node") version "3.0.1"
id ("com.github.johnrengelman.shadow") version "7.1.2"
id ("org.spongepowered.gradle.plugin") version "2.0.0"
}
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val git = versionDetails()
val releaseProperties = Properties()
releaseProperties.load(file("../../release.properties").inputStream())
group = "de.bluecolored.bluemap.bukkit"
version = releaseProperties["version"].toString()
version = "0.0.0"
val javaTarget = 16
java {
@ -110,8 +102,9 @@ tasks.processResources {
}
tasks.shadowJar {
val version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
destinationDirectory.set(file("../../build/release"))
archiveFileName.set("BlueMap-${archiveVersion.get()}-${project.name}.jar")
archiveFileName.set("BlueMap-${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")