From 4928310e7cfd36de4669c7fbd0dc045f23d56661 Mon Sep 17 00:00:00 2001
From: Thomas Broyer <t.broyer@ltgt.net>
Date: Sun, 3 Jan 2021 18:40:53 +0100
Subject: [PATCH] Update publishing to provide version from the command-line

---
 build-logic/src/main/kotlin/VersionFromGit.kt | 21 -------------------
 .../kotlin/local/maven-publish.gradle.kts     |  8 +++----
 build.gradle.kts                              |  6 ------
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 build-logic/src/main/kotlin/VersionFromGit.kt
 delete mode 100644 build.gradle.kts

diff --git a/build-logic/src/main/kotlin/VersionFromGit.kt b/build-logic/src/main/kotlin/VersionFromGit.kt
deleted file mode 100644
index 7cba52d..0000000
--- a/build-logic/src/main/kotlin/VersionFromGit.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-import org.gradle.api.Project
-import java.io.File
-
-data class VersionFromGit(
-    val project: Project,
-    val default: String
-) {
-    private val version: String by lazy {
-        val process = "git describe --exact-match --match v*".execute(null, project.rootDir)
-        if (process.waitFor() == 0) process.text.trim().removePrefix("v")
-        else default
-    }
-
-    override fun toString(): String = version
-}
-
-fun String.execute(envp: Array<String>?, workingDir: File?) =
-    Runtime.getRuntime().exec(this, envp, workingDir)
-
-val Process.text: String
-    get() = inputStream.bufferedReader().readText()
diff --git a/build-logic/src/main/kotlin/local/maven-publish.gradle.kts b/build-logic/src/main/kotlin/local/maven-publish.gradle.kts
index 205ad4e..c516b2f 100644
--- a/build-logic/src/main/kotlin/local/maven-publish.gradle.kts
+++ b/build-logic/src/main/kotlin/local/maven-publish.gradle.kts
@@ -7,9 +7,6 @@ plugins {
 }
 
 group = "net.ltgt.gradle.incap"
-if (project != rootProject) {
-    version = rootProject.version
-}
 
 java {
     withJavadocJar()
@@ -73,7 +70,7 @@ val mavenPublication = createPublication("maven")
 
 tasks.withType<PublishToMavenRepository>().configureEach {
     if (repository == sonatypeRepository) {
-        onlyIf { publication == mavenPublication }
+        onlyIf { publication == mavenPublication && publication.version != Project.DEFAULT_VERSION }
     }
 }
 
@@ -84,7 +81,8 @@ signing {
 }
 
 inline val Project.isSnapshot
-    get() = version.toString().endsWith("-SNAPSHOT")
+    get() = version.toString().endsWith("-SNAPSHOT") || version == Project.DEFAULT_VERSION
+
 //
 // For integration tests
 //
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 781de07..0000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,6 +0,0 @@
-plugins {
-    id("local.base")
-    base
-}
-
-version = VersionFromGit(project, "HEAD-SNAPSHOT")