Change SNAPSHOT is treated now as non-special stage (higher than rc)

CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### Changed
 
+- `SNAPSHOT` is treated now as non-special stage (higher than `rc`)
+
 ### Deprecated
 
 ### Removed

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 hubdle = "0.2.0-alpha.46"
 jgit = "6.4.0.202211300538-r"
-semverCore = "0.1.0-beta.10"
+semverCore = "0.1.0-beta.12"
 
 [libraries]
 javiersc-semver-semverCore = { module = "com.javiersc.semver:semver-core", version.ref = "semverCore" }

semver-gradle-plugin/main/kotlin/com/javiersc/semver/gradle/plugin/internal/CalculatedVersion.kt

@@ -25,19 +25,29 @@ internal fun calculatedVersion(
     val isClean: Boolean = clean || !checkClean
     val isDirty: Boolean = !isClean
 
+    val stagePropertySanitized =
+        stageProperty?.let { name ->
+            if (name.equals("SNAPSHOT", ignoreCase = true)) "SNAPSHOT" else name
+        }
+
+    val lastSemverStageInCurrentBranchSanitized =
+        lastSemverStageInCurrentBranch?.let { name ->
+            if (name.equals("SNAPSHOT", ignoreCase = true)) "SNAPSHOT" else name
+        }
+
     val lastSemverInCurrentBranch =
         Version(
             major = lastSemverMajorInCurrentBranch,
             minor = lastSemverMinorInCurrentBranch,
             patch = lastSemverPatchInCurrentBranch,
-            stageName = lastSemverStageInCurrentBranch,
+            stageName = lastSemverStageInCurrentBranchSanitized,
             stageNum = lastSemverNumInCurrentBranch,
         )
 
     val previousStage: String? = lastSemverInCurrentBranch.stage?.name
 
     val incStage: String =
-        (stageProperty ?: previousStage ?: "").run {
+        (stagePropertySanitized ?: previousStage ?: "").run {
             when {
                 equals(Stage.Auto(), true) && !previousStage.isNullOrBlank() -> previousStage
                 equals(Stage.Auto(), true) -> ""
@@ -46,7 +56,9 @@ internal fun calculatedVersion(
         }
 
     val isNoStagedNoScopedNoCreatingSemverTag: Boolean =
-        stageProperty.isNullOrBlank() && scopeProperty.isNullOrBlank() && !isCreatingSemverTag
+        stagePropertySanitized.isNullOrBlank() &&
+            scopeProperty.isNullOrBlank() &&
+            !isCreatingSemverTag
 
     val calculatedVersion: String =
         when {
@@ -63,15 +75,7 @@ internal fun calculatedVersion(
                     )
                 "$lastSemverInCurrentBranch$additionalVersionData"
             }
-            stageProperty.equals(Stage.Snapshot(), ignoreCase = true) -> {
-                when (scopeProperty) {
-                    Scope.Major() -> "${lastSemverInCurrentBranch.nextSnapshotMajor()}"
-                    Scope.Minor() -> "${lastSemverInCurrentBranch.nextSnapshotMinor()}"
-                    Scope.Patch() -> "${lastSemverInCurrentBranch.nextSnapshotPatch()}"
-                    else -> "${lastSemverInCurrentBranch.nextSnapshotPatch()}"
-                }
-            }
-            stageProperty.equals(Stage.Final(), ignoreCase = true) -> {
+            stagePropertySanitized.equals(Stage.Final(), ignoreCase = true) -> {
                 when (scopeProperty) {
                     Scope.Major() -> "${lastSemverInCurrentBranch.inc(Increase.Major, "")}"
                     Scope.Minor() -> "${lastSemverInCurrentBranch.inc(Increase.Minor, "")}"

semver-gradle-plugin/main/kotlin/com/javiersc/semver/gradle/plugin/internal/SemverProperties.kt

@@ -34,7 +34,7 @@ internal enum class SemverProperties(val key: String) {
 internal enum class Stage(private val value: String) {
     Auto("auto"),
     Final("final"),
-    Snapshot("snapshot");
+    ;
 
     operator fun invoke(): String = value
 }

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-alpha_1 to v1_0_0-SNAPSHOT/expect-version.txt

@@ -0,0 +1,2 @@
+1.0.0-SNAPSHOT
+v1.0.0-SNAPSHOT

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-rc_3 to v1_0_0-SNAPSHOT/ARGUMENTS.txt

@@ -0,0 +1 @@
+createSemverTag -Psemver.stage=snapshot -Psemver.tagPrefix=v

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-rc_3 to v1_0_0-SNAPSHOT/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    id("com.javiersc.semver.gradle.plugin")
+}
+
+semver {
+    tagPrefix.set("v")
+}

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-rc_3 to v1_0_0-SNAPSHOT/expect-version.txt

@@ -0,0 +1,2 @@
+1.0.0-SNAPSHOT
+v1.0.0-SNAPSHOT

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-rc_3 to v1_0_0-SNAPSHOT/gradle.properties

@@ -0,0 +1 @@
+semver.tagPrefix=v

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-rc_3 to v1_0_0-SNAPSHOT/last-tag.txt

@@ -0,0 +1 @@
+v1.0.0-rc.3

semver-gradle-plugin/test/resources/properties/stage/snapshot v1_0_0-rc_3 to v1_0_0-SNAPSHOT/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "sandbox-project"

settings.gradle.kts

@@ -9,6 +9,7 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
         google()
+        mavenLocal()
     }
 
     plugins {
@@ -19,3 +20,11 @@ pluginManagement {
 plugins {
     id("com.javiersc.hubdle.settings")
 }
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+        mavenLocal()
+    }
+}