From ae5d59caf06290b0e34b654b5c62d3bbc30517e2 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Mon, 12 Nov 2018 15:54:17 +0300
Subject: [PATCH] Add a new root of <...>.dsl.KotlinCompile hierarchy in API

This new interface uses a more general type for its kotlinOptions,
KotlinCommonToolOptions rather than KotlinCommonOptions. This is
needed for the Kotlin/Native task to implement a common interface
with the other Kotlin compilation tasks.
---
 .../kotlin/gradle/dsl/KotlinCompile.kt        | 24 +++++++++++++++++++
 .../kotlin/gradle/dsl/KotlinCompile.kt        | 15 ------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
new file mode 100644
index 00000000000..6fb72d3c242
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.dsl
+
+import groovy.lang.Closure
+import org.gradle.api.Task
+import org.gradle.api.tasks.Internal
+
+interface KotlinCompile<out T : KotlinCommonOptions> : Task {
+    @get:Internal
+    val kotlinOptions: T
+
+    fun kotlinOptions(fn: T.() -> Unit) {
+        kotlinOptions.fn()
+    }
+
+    fun kotlinOptions(fn: Closure<*>) {
+        fn.delegate = kotlinOptions
+        fn.call()
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
index 17339926031..cd242e67490 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
@@ -18,21 +18,6 @@ package org.jetbrains.kotlin.gradle.dsl
 
 import groovy.lang.Closure
 import org.gradle.api.Task
-import org.gradle.api.tasks.Internal
-
-interface KotlinCompile<T : KotlinCommonOptions> : Task {
-    @get:Internal
-    val kotlinOptions: T
-
-    fun kotlinOptions(fn: T.() -> Unit) {
-        kotlinOptions.fn()
-    }
-
-    fun kotlinOptions(fn: Closure<*>) {
-        fn.delegate = kotlinOptions
-        fn.call()
-    }
-}
 
 interface KotlinJsCompile : KotlinCompile<KotlinJsOptions>