erik/semver-gradle
erik/semver-gradle
1
1
Fork 0
Code Issues Pull requests Releases Activity

Ensured only positive int in major, minor and patch.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-04-19 00:09:03 -07:00
parent 338899e317
commit a729d3a87c
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt
View file

@ -138,17 +138,17 @@ object Utils {
try { try {
// major // major
if (start != -1) { if (start != -1) {
major = semver.substring(0, start).toInt() major = Math.abs(semver.substring(0, start).toInt())
semver.delete(0, start + major.length()) semver.delete(0, start + major.length())
start = semver.indexOf(version.separator) start = semver.indexOf(version.separator)
// minor // minor
if (start != -1) { if (start != -1) {
minor = semver.substring(0, start).toInt() minor = Math.abs(semver.substring(0, start).toInt())
semver = semver.delete(0, start + minor.length()) semver = semver.delete(0, start + minor.length())
start = semver.indexOf(version.preReleasePrefix) start = semver.indexOf(version.preReleasePrefix)
// patch // patch
if (start != -1) { if (start != -1) {
patch = semver.substring(0, start).toInt() patch = Math.abs(semver.substring(0, start).toInt())
semver.delete(0, start + minor.length()) semver.delete(0, start + minor.length())
start = semver.lastIndexOf(version.buildMetaPrefix) start = semver.lastIndexOf(version.buildMetaPrefix)
// pre-release // pre-release
@ -169,11 +169,13 @@ object Utils {
} else if (semver.isNotEmpty()) { } else if (semver.isNotEmpty()) {
// no pre-release // no pre-release
start = semver.lastIndexOf(version.buildMetaPrefix) start = semver.lastIndexOf(version.buildMetaPrefix)
// patch & build meta
if (start != -1) { if (start != -1) {
patch = semver.substring(0, start).toInt() patch = semver.substring(0, start).toInt()
semver.delete(0, start + minor.length()) semver.delete(0, start + minor.length())
buildMeta = semver.toString() buildMeta = semver.toString()
} else { } else {
// patch
patch = semver.toString().toInt() patch = semver.toString().toInt()
} }
semver.clear() semver.clear()