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

A native counterpart for plubing metadata and ir versions to klib manifest

Browse Source 
(cherry picked from commit 06a515393df6c1c071a551353a2a82fd2252a24c)
This commit is contained in:
Alexander Gorshenev
2019-11-28 03:17:32 +03:00
committed by Vasily Levchenko
parent aafe34db13
commit fcba683e72
17 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+3 -3
View File
@@ -76,7 +76,7 @@ ext {
kotlinNativeUtilsModule="org.jetbrains.kotlin:kotlin-native-utils:${kotlinVersion}"
kotlinUtilKliMetadatabModule="org.jetbrains.kotlin:kotlin-util-klib-metadata:${kotlinVersion}"
konanVersionFull = KonanVersionGeneratedKt.getCurrentKonanVersion()
konanVersionFull = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
gradlePluginVersion = konanVersionFull
}
@@ -631,7 +631,7 @@ task uploadBundle {
}
}
task teamcityKonanVersion {
task teamcityCompilerVersion {
doLast {
println("##teamcity[setParameter name='kotlin.native.version.base' value='$konanVersion']")
println("##teamcity[setParameter name='kotlin.native.version.full' value='$konanVersionFull']")
@@ -650,7 +650,7 @@ task clean {
task pusher(type: KotlinBuildPusher){
kotlinVersion = project.kotlinVersion
konanVersion = KonanVersionGeneratedKt.getCurrentKonanVersion()
konanVersion = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
buildServer = "buildserver.labs.intellij.net"
compilerConfigurationId = System.getenv("TEAMCITY_COMPILER_ID") ?: "Kotlin_KotlinDev_Compiler"
overrideConfigurationId = System.getenv("TEAMCITY_OVERRIDE_NATIVE_ID") ?: "Kotlin_KotlinDev_DeployMavenArtifacts_OverrideNative"