Update publishing to provide version from the command-line

tbroyer · Jan 24, 2023 · 4928310 · 4928310
1 parent 21afe33
commit 4928310
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/build-logic/src/main/kotlin/VersionFromGit.kt b/build-logic/src/main/kotlin/VersionFromGit.kt
diff --git 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