[build][version]compiler version with milestone clause

2020-02-21 15:17:45 +01:00
parent f2e051e2a2
commit 15384777c5
1 changed files with 3 additions and 2 deletions
@@ -41,16 +41,17 @@ open class VersionGenerator: DefaultTask() {
                val major = version[0].toInt()
                val minor = version[1].toInt()
                val maintenance = if (version.size > 2) version[2].toInt() else 0
+                val milestone = konanVersion.split("-M").getOrNull(1)?.toInt() ?: -1
                project.logger.info("BUILD_NUMBER: $buildNumber")
                val build = buildNumber?.let {
-                    it.split("-")[2].toInt() //7-dev-buildcount
+                    it.split("-").last().toInt() //7-dev-buildcount
                }?: -1

                + """
                   |package org.jetbrains.kotlin.konan
                   |
                   |internal val currentCompilerVersion: CompilerVersion =
-                   |    CompilerVersionImpl($meta, $major, $minor, $maintenance, $build)
+                   |    CompilerVersionImpl($meta, $major, $minor, $maintenance, $milestone, $build)
                   |
                   |val CompilerVersion.Companion.CURRENT: CompilerVersion
                   |    get() = currentCompilerVersion