From f8b65198642cbfb20300ab1680a9db14fd2d2b87 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 25 Oct 2017 12:43:43 +0300 Subject: [PATCH] Fix platform lib build on TeamCity --- build.gradle | 2 +- klib/platform.gradle | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index dfe91186cce..4098943fc6b 100644 --- a/build.gradle +++ b/build.gradle @@ -300,7 +300,7 @@ targetList.each { target -> dir project(':klib').projectDir startParameter.projectProperties = [ 'konan.jvmArgs' : jvmArgs, - 'kotlin_version' : kotlin_version, + 'konanVersion' : konanVersion, 'name' : defFile.name, 'defFile' : defFile.file.absolutePath, 'konan.home' : distDir, diff --git a/klib/platform.gradle b/klib/platform.gradle index 2ae4446290e..920d3af95a4 100644 --- a/klib/platform.gradle +++ b/klib/platform.gradle @@ -1,10 +1,11 @@ apply plugin: 'konan' buildscript { + + def konanVersion = gradle.startParameter.projectProperties['konanVersion'] + dependencies { - classpath files(project.file('../tools/kotlin-native-gradle-plugin/build/libs').listFiles().findAll { - it.name.endsWith('.jar') - }.collect().first().absolutePath) + classpath files("../tools/kotlin-native-gradle-plugin/build/libs/kotlin-native-gradle-plugin-${konanVersion}.jar") } }