diff --git a/compiler/util-io/src/org/jetbrains/kotlin/konan/CompilerVersion.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/CompilerVersion.kt index 3c5dfd84b0b..66ba0c05f9b 100644 --- a/compiler/util-io/src/org/jetbrains/kotlin/konan/CompilerVersion.kt +++ b/compiler/util-io/src/org/jetbrains/kotlin/konan/CompilerVersion.kt @@ -12,6 +12,7 @@ interface CompilerVersion : Serializable { val major: Int val minor: Int val maintenance: Int + val milestone: Int val build: Int fun toString(showMeta: Boolean, showBuild: Boolean): String @@ -30,6 +31,7 @@ interface CompilerVersion : Serializable { major.toInt(), minor.toInt(), maintenance.toIntOrNull() ?: 0, + -1, build.toIntOrNull() ?: -1 ) } @@ -43,6 +45,7 @@ data class CompilerVersionImpl( override val major: Int, override val minor: Int, override val maintenance: Int, + override val milestone: Int = -1, override val build: Int = -1 ) : CompilerVersion { diff --git a/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt b/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt index 02e6466735a..54bb0d1f319 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt @@ -94,6 +94,7 @@ open class VersionGenerator: DefaultTask() { val minor = matcher.group(2).toInt() val maintenanceStr = matcher.group(3) val maintenance = maintenanceStr?.toInt() ?: 0 + val milestone = -1 project.logger.info("BUILD_NUMBER: $buildNumber") var build = -1 if (buildNumber != null) { @@ -101,7 +102,7 @@ open class VersionGenerator: DefaultTask() { build = buildNumberSplit[buildNumberSplit.size - 1].toInt() // //7-dev-buildcount } - val versionObject = CompilerVersionImpl(meta, major, minor, maintenance, build) + val versionObject = CompilerVersionImpl(meta, major, minor, maintenance, milestone, build) versionObject.serialize() } @@ -114,7 +115,7 @@ open class VersionGenerator: DefaultTask() { """|package org.jetbrains.kotlin.konan |internal val currentCompilerVersion: CompilerVersion = |CompilerVersionImpl($meta, $major, $minor, - | $maintenance, $build) + | $maintenance, $milestone, $build) |val CompilerVersion.Companion.CURRENT: CompilerVersion |get() = currentCompilerVersion""".trimMargin() )