From 9cbcafa8d1d2c1dccac708207b2d92082a139ab1 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 29 Apr 2021 11:49:49 +0200 Subject: [PATCH] [dependencies][kotlin-build-gradle-plugin] version 0.0.27 - reading konanVersion and konanMetaVersion from project properties --- dependencies/kotlin-build-gradle-plugin/build.gradle.kts | 2 +- .../kotlin-build-gradle-plugin/src/VersionGenerator.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts index 455ab891bf2..ba3ae34541b 100644 --- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts +++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "org.jetbrains.kotlin" -version = "0.0.26" +version = "0.0.27" repositories { mavenCentral() diff --git a/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt b/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt index f2244836239..1f9679d23f3 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt @@ -63,7 +63,7 @@ open class VersionGenerator: DefaultTask() { open var versionFile: File? = project.file("${versionSourceDirectory.path}/org/jetbrains/kotlin/konan/CompilerVersionGenerated.kt") @Input - open val konanVersion = kotlinNativeProperties["konanVersion"].toString() + open val konanVersion = project.findProperty("konanVersion") as? String ?: kotlinNativeProperties["konanVersion"].toString() // TeamCity passes all configuration parameters into a build script as project properties. @@ -73,7 +73,7 @@ open class VersionGenerator: DefaultTask() { open val buildNumber = project.findProperty("build.number")?.toString() @Input - open val meta = kotlinNativeProperties["konanMetaVersion"]?.let{ MetaVersion.valueOf(it.toString().toUpperCase()) } ?: MetaVersion.DEV + open val meta = (project.findProperty("konanMetaVersion") as? String ?: kotlinNativeProperties["konanMetaVersion"])?.let{ MetaVersion.valueOf(it.toString().toUpperCase()) } ?: MetaVersion.DEV private val versionPattern = Pattern.compile( "^(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-M(\\p{Digit}))?(?:-(\\p{Alpha}\\p{Alnum}*))?(?:-(\\d+))?$"