azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dependencies][kotlin-build-gradle-plugin] version 0.0.27

Browse Source 
- reading konanVersion and konanMetaVersion from project properties
This commit is contained in:
Vasily Levchenko
2021-04-29 11:49:49 +02:00
committed by Space
parent 72804d2e8c
commit 9cbcafa8d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dependencies/kotlin-build-gradle-plugin/build.gradle.kts
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
}
group = "org.jetbrains.kotlin"
version = "0.0.26"
version = "0.0.27"
repositories {
mavenCentral()
dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt
Vendored
+2 -2
View File
@@ -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+))?$"