Fix SNAPSHOT is not appended at the end of the version in all cases

JavierSegoviaCordoba · Aug 5, 2023 · 93d05da · 93d05da
1 parent c86528b
commit 93d05da
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 ### Fixed
 
+- `SNAPSHOT` is not appended at the end of the version in all cases
+
 ### Updated
 
 ## [0.5.0-rc.4] - 2023-08-04

diff --git a/gradle-version/main/kotlin/com/javiersc/gradle/version/GradleVersion.kt b/gradle-version/main/kotlin/com/javiersc/gradle/version/GradleVersion.kt
@@ -662,9 +662,8 @@ private fun buildVersion(
  append(minor)
  append(".")
  append(patch)
- if (stageName.isNotNullNorBlank()) {
- append("-")
- append(GradleVersion.Stage(stageName, stageNum).toString())
+ if (!stageName.equals("SNAPSHOT", ignoreCase = true)) {
+ appendStage(stageName, stageNum)
  }
  if (commits != null) {
  append(".")
@@ -678,6 +677,16 @@ private fun buildVersion(
  append("+")
  append(metadata)
  }
+ if (stageName.equals("SNAPSHOT", ignoreCase = true)) {
+ appendStage(stageName, stageNum)
+ }
+}
+
+private fun StringBuilder.appendStage(stageName: String?, stageNum: Int?) {
+ if (stageName.isNotNullNorBlank()) {
+ append("-")
+ append(GradleVersion.Stage(stageName, stageNum).toString())
+ }
 }
 
 private const val RED = "\u001b[31m"

diff --git a/gradle-version/test/kotlin/com/javiersc/gradle/version/GradleVersionTest.kt b/gradle-version/test/kotlin/com/javiersc/gradle/version/GradleVersionTest.kt
@@ -104,7 +104,11 @@ internal class GradleVersionTest {
  metadata != null -> "+$metadata"
  else -> ""
  }
- Version("$scope$stage$commitsAndOrHashAndOrMetadata")
+ if (!stage.contains("SNAPSHOT", ignoreCase = true)) {
+ Version("$scope$stage$commitsAndOrHashAndOrMetadata")
+ } else {
+ Version("$scope$commitsAndOrHashAndOrMetadata$stage")
+ }
  }
 
  private val versionArbitrarySameMajorMinorPatch: Arb<Version> = arbitrary {
@@ -743,6 +747,22 @@ internal class GradleVersionTest {
  Version("1.0.0-RC.1") shouldBe Version("1.0.0-rc.1")
  }
 
+ @Test
+ fun edge_cases() {
+ Version("1.0.0.0+M3t4D4ta-SNAPSHOT")
+ Version("1.0.0.21+M3t4D4ta-SNAPSHOT")
+ Version("1.0.0.0+1.9.2-dev-5787-SNAPSHOT")
+ Version("1.0.0.12+1.9.2-dev-5787-SNAPSHOT")
+ Version("1.0.0+1.9.2-dev-5787-SNAPSHOT")
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT-11") }
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT-jjj11") }
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT-jaaj") }
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT-jjj") }
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT+jjj") }
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT+1.9.2") }
+ shouldThrow<GradleVersionException> { Version("1.0.0-SNAPSHOT+1.9.2-dev-5677") }
+ }
+
  @Test
  fun is_version() {
  Version("1.0.0").apply {