From fd27518070406f0cc445773a0c21b88555ea099a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sat, 26 Jul 2014 02:28:51 +0400
Subject: [PATCH] Fix build tool plugins after recent changes to CLI

---
 .../src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt     | 2 +-
 .../kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt | 2 +-
 .../tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt | 2 +-
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt  | 6 +++---
 .../org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt
index 2a9ee9df515..f2943525254 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt
@@ -23,7 +23,7 @@ class HtmlVisitorTest {
         val args = K2JVMCompilerArguments()
         args.kotlinHome = "../../../dist/kotlinc"
         args.freeArgs = listOf(srcDir.toString())
-        args.outputDir = File(dir, "target/classes-htmldocs").toString()
+        args.destination = File(dir, "target/classes-htmldocs").toString()
 
         val compiler = K2JVMCompiler()
         compiler.getCompilerPlugins().add(HtmlCompilerPlugin())
diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt
index 1449995881b..718176d92d7 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt
@@ -50,7 +50,7 @@ class KDocSampleTest {
         classesOutputDir.rmrf()
         classesOutputDir.mkdirsProperly()
 
-        args.outputDir = classesOutputDir.getPath()
+        args.destination = classesOutputDir.getPath()
 
         args.docConfig.docOutputDir = outputDir.getPath()
         args.docConfig.title = "Sample"
diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
index c0741f9fb87..75372815634 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
@@ -30,7 +30,7 @@ class KDocTest {
         args.freeArgs = listOf("../../stdlib/src",
                                "../../kunit/src/main/kotlin",
                                "../../kotlin-jdbc/src/main/kotlin")
-        args.outputDir = "target/classes-stdlib"
+        args.destination = "target/classes-stdlib"
         args.noStdlib = true
         args.classpath = "../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar${File.pathSeparator}../../lib/junit-4.9.jar"
 
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 82ec91fc94d..994d1279493 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -107,7 +107,7 @@ public open class KotlinCompile(): AbstractCompile() {
             args.classpath = effectiveClassPath
         }
 
-        args.outputDir = if (StringUtils.isEmpty(kotlinOptions.outputDir)) { kotlinDestinationDir?.getPath() } else { kotlinOptions.outputDir }
+        args.destination = if (StringUtils.isEmpty(kotlinOptions.destination)) { kotlinDestinationDir?.getPath() } else { kotlinOptions.destination }
 
         val embeddedAnnotations = getAnnotations(getProject(), getLogger())
         val userAnnotations = (kotlinOptions.annotations ?: "").split(File.pathSeparatorChar).toList()
@@ -139,7 +139,7 @@ public open class KotlinCompile(): AbstractCompile() {
 
         getLogger().debug("Copying resulting files to classes")
         // Copy kotlin classes to all classes directory
-        val outputDirFile = File(args.outputDir!!)
+        val outputDirFile = File(args.destination!!)
         if (outputDirFile.exists()) {
             FileUtils.copyDirectory(outputDirFile, getDestinationDir())
         }
@@ -180,7 +180,7 @@ public open class KDoc(): SourceTask() {
         // KDoc compiler does not accept list of files as input. Try to pass directories instead.
         args.freeArgs = getSource().map { it.getParentFile()!!.getAbsolutePath() }
         // Drop compiled sources to temp. Why KDoc compiles anything after all?!
-        args.outputDir = getTemporaryDir()?.getAbsolutePath()
+        args.destination = getTemporaryDir()?.getAbsolutePath()
 
         getLogger().warn(args.freeArgs.toString())
         val embeddedAnnotations = getAnnotations(getProject(), getLogger())
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
index 0bbd944dd52..409ca251bbe 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
@@ -316,7 +316,7 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
         }
 
         log.info("Classes directory is " + output);
-        arguments.outputDir = output;
+        arguments.destination = output;
 
         arguments.noJdkAnnotations = true;
         arguments.annotations = getFullAnnotationsPath(log, annotationPaths);