From 25f113ebdbddaf8cd838fca8f9ed2026cb68babd Mon Sep 17 00:00:00 2001
From: "Lukas Rieger (Blue)" <TBlueF@users.noreply.github.com>
Date: Mon, 1 Aug 2022 23:10:19 +0200
Subject: [PATCH] Try to fix publication and versioning

---
 .github/workflows/publish.yml |  1 +
 build.gradle.kts              | 17 +++++++++++------
 gradle.properties             |  2 --
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a19488c..60f8e60 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,6 +3,7 @@ name: Java CI
 on:
   release:
     types: [ published ]
+  workflow_dispatch
 
 jobs:
   build:
diff --git a/build.gradle.kts b/build.gradle.kts
index 89b2c07..a24ee4d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,11 +7,6 @@ plugins {
     id("com.diffplug.spotless") version "6.1.2"
 }
 
-group = "de.bluecolored.bluemap.api"
-
-val apiVersion: String by project
-version = apiVersion
-
 fun String.runCommand(): String = ProcessBuilder(split("\\s(?=(?:[^'\"`]*(['\"`])[^'\"`]*\\1)*[^'\"`]*$)".toRegex()))
     .directory(projectDir)
     .redirectOutput(ProcessBuilder.Redirect.PIPE)
@@ -28,8 +23,18 @@ fun String.runCommand(): String = ProcessBuilder(split("\\s(?=(?:[^'\"`]*(['\"`]
 
 val gitHash = "git rev-parse --verify HEAD".runCommand()
 val clean = "git status --porcelain".runCommand().isEmpty()
+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)")
 
+group = "de.bluecolored.bluemap.api"
+version = lastVersion +
+        (if (commits == "0") "" else "-$commits") +
+        (if (clean) "" else "-dirty")
+
+println("Version: $version")
+
 val javaTarget = 11
 java {
     sourceCompatibility = JavaVersion.toVersion(javaTarget)
@@ -105,7 +110,7 @@ publishing {
     publications {
         register<MavenPublication>("gpr") {
             from(components["java"])
-            artifactId = "BlueMapAPI"
+            artifactId = "bluemap_api"
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 85551c1..29b2ac4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,2 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-
-apiVersion=2.0.0