From ecd54d9b21efc9435b6816f087f316e2f4b57cf7 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Mon, 12 Nov 2018 15:47:16 +0300
Subject: [PATCH] (minor) Move KotlinCommonToolOptions to
 kotlin-gradle-plugin-api

This change is needed to expose `kotlinOptions { ... }` in the
API interfaces.
---
 .../kotlin/generators/arguments/GenerateGradleOptions.kt     | 5 +++--
 .../org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt   | 0
 .../jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt   | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename libraries/tools/{kotlin-gradle-plugin => kotlin-gradle-plugin-api}/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt (100%)
 rename libraries/tools/{kotlin-gradle-plugin => kotlin-gradle-plugin-api}/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt (100%)

diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
index 7b68b83bf8a..c870a151abd 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
@@ -37,13 +37,14 @@ interface AdditionalGradleProperties {
 }
 
 fun generateKotlinGradleOptions(withPrinterToFile: (targetFile: File, Printer.()->Unit)->Unit) {
+    val apiSrcDir = File("libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin")
     val srcDir = File("libraries/tools/kotlin-gradle-plugin/src/main/kotlin")
 
     // common interface
     val commonInterfaceFqName = FqName("org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions")
     val commonOptions =  gradleOptions<CommonToolArguments>()
     val additionalOptions = gradleOptions<AdditionalGradleProperties>()
-    withPrinterToFile(File(srcDir, commonInterfaceFqName)) {
+    withPrinterToFile(File(apiSrcDir, commonInterfaceFqName)) {
         generateInterface(commonInterfaceFqName,
                           commonOptions + additionalOptions)
     }
@@ -53,7 +54,7 @@ fun generateKotlinGradleOptions(withPrinterToFile: (targetFile: File, Printer.()
 
     val commonCompilerInterfaceFqName = FqName("org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions")
     val commonCompilerOptions = gradleOptions<CommonCompilerArguments>()
-    withPrinterToFile(File(srcDir, commonCompilerInterfaceFqName)) {
+    withPrinterToFile(File(apiSrcDir, commonCompilerInterfaceFqName)) {
         generateInterface(commonCompilerInterfaceFqName,
                           commonCompilerOptions,
                           parentType = commonInterfaceFqName)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
rename to libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt
rename to libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt