From e4f2165b16c80469f6a3f5cda5ae2489a1487fae Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Wed, 19 Sep 2018 12:22:50 +0300
Subject: [PATCH] Don't use deprecated DSL in tests

---
 .../experimental/tasks/KotlinNativeCompile.kt |  5 ++---
 .../test/kotlin/ExperimentalPluginTests.kt    | 20 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
index 305cc15c3ee..8c5f9b81a86 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
@@ -118,10 +118,9 @@ open class KotlinNativeCompile @Inject constructor(internal val binary: Abstract
         }
     }
 
-    // initializing AbstractCompile properties
+    // Initializing AbstractCompile properties.
     init {
-        @Suppress("LeakingThis")
-        setDestinationDir(project.provider {
+        this.setDestinationDir(project.provider {
             if (outputFile.isDirectory) outputFile else outputFile.parentFile
         })
         sourceCompatibility = "1.6"
diff --git a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
index 6dd4a39f457..dc97a22bec1 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
+++ b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
@@ -125,7 +125,7 @@ class ExperimentalPluginTests {
                 version '1.0'
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                 }
 
                 publishing {
@@ -159,7 +159,7 @@ class ExperimentalPluginTests {
                 }
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                     outputKinds = [ EXECUTABLE ]
                 }
             """.trimIndent())
@@ -226,7 +226,7 @@ class ExperimentalPluginTests {
                 plugins { id 'kotlin-native' }
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                 }
 
                 dependencies {
@@ -241,7 +241,7 @@ class ExperimentalPluginTests {
                 plugins { id 'kotlin-native'}
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                 }
 
             """.trimIndent())
@@ -257,7 +257,7 @@ class ExperimentalPluginTests {
                 plugins { id 'kotlin-native' }
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                     outputKinds = [ EXECUTABLE ]
                 }
 
@@ -295,7 +295,7 @@ class ExperimentalPluginTests {
                 version '1.0'
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                 }
 
                 dependencies {
@@ -324,7 +324,7 @@ class ExperimentalPluginTests {
                 version '1.0'
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                 }
 
                 publishing {
@@ -359,7 +359,7 @@ class ExperimentalPluginTests {
                 }
 
                 sourceSets.main.component {
-                    target 'host', 'wasm32'
+                    targets = ['host', 'wasm32']
                     outputKinds = [ EXECUTABLE ]
                 }
             """.trimIndent())
@@ -444,7 +444,7 @@ class ExperimentalPluginTests {
                 sourceSets.main {
                     component {
                         outputKinds = [ EXECUTABLE, KLIBRARY, FRAMEWORK ]
-                        target 'host', 'wasm32'
+                        targets = ['host', 'wasm32']
                     }
                 }
 
@@ -498,7 +498,7 @@ class ExperimentalPluginTests {
                 sourceSets.main {
                     component {
                         outputKinds = [ DYNAMIC, STATIC ]
-                        target 'host'
+                        targets = ['host']
                     }
                 }