From dd7ddbcc244981a1c3d84b577152f679de0554e7 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 14 Sep 2017 12:38:45 +0300 Subject: [PATCH] [build][platform] adoption recent changes in konan interop plugin --- build.gradle | 2 +- klib/platform.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b7ff31e4e53..74b21e884ab 100644 --- a/build.gradle +++ b/build.gradle @@ -273,7 +273,7 @@ targetList.each { target -> suffix = 'bat' task(taskName, type:GradleBuild) { dependsOn ':tools:kotlin-native-gradle-plugin:jar' - tasks = ['clean', 'compileKonan', 'klibInstall'] + tasks = ['clean', 'klibInstall'] buildFile project('klib').file('platform.gradle') dir project(':klib').projectDir startParameter.projectProperties = [ diff --git a/klib/platform.gradle b/klib/platform.gradle index 9898324ae5f..ae00f7d5cd8 100644 --- a/klib/platform.gradle +++ b/klib/platform.gradle @@ -22,10 +22,10 @@ def suffix = gradle.startParameter.projectProperties['suffix'] def klibProgram = suffix?"${gradle.startParameter.projectProperties['konan.home']}/bin/klib.$suffix" : "${gradle.startParameter.projectProperties['konan.home']}/bin/klib" task klibInstall(type:Exec) { - dependsOn compileKonan + dependsOn konanInterop["$taskName"].interopProcessingTask commandLine klibProgram, 'install', - project.file("build/konan/interopCompiledStubs/${taskName}InteropStubs/${taskName}InteropStubs.klib"), + konanInterop["$taskName"].interopProcessingTask.kLib, '-repository', gradle.startParameter.projectProperties['konan.home'] } \ No newline at end of file