diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SemanticVersion.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SemanticVersion.kt index 64b5907..a3cb36d 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SemanticVersion.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SemanticVersion.kt @@ -1,7 +1,5 @@ package io.gitlab.jfronny.scripts -import java.lang.Runtime.Version - data class SemanticVersion(val major: Int, val minor: Int, val patch: Int, val type: VersionType, val build: String?): Comparable { init { require(build == null || buildPattern.matches(build)) { "Illegal build string" } @@ -46,7 +44,7 @@ data class SemanticVersion(val major: Int, val minor: Int, val patch: Int, val t companion object { private val identifier = Regex("[a-zA-Z1-9][a-zA-Z0-9]*") private val buildPattern = Regex("$identifier(?:\\.$identifier)+") - private val number = Regex("[1-9][0-9]*") + private val number = Regex("[1-9][0-9]*|0") private val versionCore = Regex("($number)\\.($number)\\.($number)") private val legacyVersion = Regex("([vba]|rc)$versionCore(\\+$buildPattern)?") private val restrictedSemver = Regex("$versionCore(-(?:alpha|beta|rc))?(\\+$buildPattern)?") diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt index b508848..d112d7f 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt @@ -7,7 +7,7 @@ enum class VersionType(val displayName: String, val curseforgeName: String, val ALPHA("Alpha", "alpha", "alpha", "alpha", "a"), BETA("Beta", "beta", "beta", "beta", "b"), RELEASE_CANDIDATE("Release Candidate", "beta", "beta", "rc", "rc"), - RELEASE("Release", "release", "release", "release", "r"); + RELEASE("Release", "release", "release", "release", "v"); companion object { private val byShorthand = Arrays.stream(VersionType.values()).collect(Collectors.toUnmodifiableMap({ it.shorthand }, { it }))