From 9d907843609add4417ec824e0e970b534b63a986 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 17 Oct 2017 17:47:26 +0300
Subject: [PATCH] platform-libs: Use reworked DSL in gradle build

---
 klib/platform.gradle | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/klib/platform.gradle b/klib/platform.gradle
index 98299404590..d9df6bdc438 100644
--- a/klib/platform.gradle
+++ b/klib/platform.gradle
@@ -10,15 +10,18 @@ buildscript {
 
 def taskName = "${gradle.startParameter.projectProperties['name']}"
 String konanHome = gradle.startParameter.projectProperties['konan.home']
-List<String> libraries = gradle.startParameter.projectProperties.libraries.split(" ").findAll { !it.isEmpty() }
+List<String> libs = gradle.startParameter.projectProperties.libraries.split(" ").findAll { !it.isEmpty() }
 String targetName = gradle.startParameter.projectProperties.target
 
-konanInterop {
-    "$taskName" {
+konanTargets = [targetName]
+
+konanArtifacts {
+    interop("$taskName") {
         defFile gradle.startParameter.projectProperties.defFile
-        target targetName
         noDefaultLibs true
-        extraOpts libraries.collectMany { ["-library",  "$konanHome/klib/$targetName/$it"] }
+        libraries {
+            files libs.collect { "$konanHome/klib/$targetName/$it" }
+        }
     }
 }
 
@@ -31,10 +34,10 @@ task klibInstall(type:Exec) {
         new File(repo).mkdirs()
     }
 
-    dependsOn konanInterop["$taskName"].interopProcessingTask
+    dependsOn konanArtifacts."$taskName"."$targetName"
     commandLine klibProgram,
             'install',
-            konanInterop["$taskName"].interopProcessingTask.klib,
+            konanArtifacts."$taskName"."$targetName".artifact,
             '-target', gradle.startParameter.projectProperties.target,
             '-repository',
             repo