From fad40ac11e17c90a5acbb4dc7b71250ac9a7ce68 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sat, 3 Jan 2015 13:33:56 +0300
Subject: [PATCH] Rename package jet -> kotlin in ant

org.jetbrains.jet.buildtools.ant -> org.jetbrains.kotlin.ant

The old antlib.xml is kept for migration purposes
---
 .../jetbrains/jet/buildtools/ant/antlib.xml   | 18 +++------
 .../ant/Kotlin2JsTask.kt                      |  4 +-
 .../ant/Kotlin2JvmTask.kt                     |  4 +-
 .../ant/KotlinCompilerAdapter.java            |  4 +-
 .../ant/KotlinCompilerBaseTask.kt             |  4 +-
 ant/src/org/jetbrains/kotlin/ant/antlib.xml   |  5 +++
 .../ant/js/additionalArguments/build.xml      |  2 +-
 .../ant/js/bothPrefixAndPostfix/build.xml     |  2 +-
 .../integration/ant/js/manySources/build.xml  |  2 +-
 .../ant/js/noOutputParam/build.xml            |  2 +-
 .../integration/ant/js/noSrcParam/build.xml   |  2 +-
 .../ant/js/outputPostfix/build.xml            |  2 +-
 .../integration/ant/js/outputPrefix/build.xml |  2 +-
 .../integration/ant/js/simple/build.xml       |  2 +-
 .../ant/js/simpleWithMain/build.xml           |  2 +-
 .../ant/js/simpleWithMainFQArgs/build.xml     |  2 +-
 .../ant/js/simpleWithStdlib/build.xml         |  2 +-
 .../simpleWithStdlibAndAnotherLib/build.xml   |  2 +-
 .../build.xml                                 |  2 +-
 .../ant/js/simpleWithVarargMain/build.xml     |  2 +-
 .../build.log.expected                        |  0
 .../ant/js/{sourcemap => sourceMap}/build.xml |  2 +-
 .../js/{sourcemap => sourceMap}/root1/foo.kt  |  0
 .../ant/js/suppressWarnings/build.xml         |  2 +-
 .../integration/ant/js/verbose/build.xml      |  2 +-
 .../integration/ant/js/version/build.xml      |  2 +-
 .../ant/jvm/additionalArguments/build.xml     |  2 +-
 .../ant/jvm/externalAnnotations/build.xml     | 36 +++++++++---------
 .../root1/a/j/annotations.xml                 |  2 +-
 .../root1/b/j/annotations.xml                 |  2 +-
 .../integration/ant/jvm/helloWorld/build.xml  |  2 +-
 .../ant/jvm/javacCompiler/build.xml           | 16 ++++----
 .../ant/jvm/jvmClasspath/build.xml            |  2 +-
 .../ant/jvm/kotlinCompiler/build.xml          | 38 +++++++++----------
 .../kotlinCompiler/root1/a/j/annotations.xml  |  2 +-
 .../kotlinCompiler/root1/b/j/annotations.xml  |  2 +-
 .../ant/jvm/manySourceRoots/build.xml         |  2 +-
 .../ant/jvm/suppressWarnings/build.xml        |  2 +-
 .../integration/ant/jvm/verbose/build.xml     |  2 +-
 .../integration/ant/jvm/version/build.xml     |  2 +-
 .../40702623_Kotlin+Build+Tools.confluence    |  2 +-
 41 files changed, 93 insertions(+), 96 deletions(-)
 rename ant/src/org/jetbrains/{jet/buildtools => kotlin}/ant/Kotlin2JsTask.kt (96%)
 rename ant/src/org/jetbrains/{jet/buildtools => kotlin}/ant/Kotlin2JvmTask.kt (96%)
 rename ant/src/org/jetbrains/{jet/buildtools => kotlin}/ant/KotlinCompilerAdapter.java (95%)
 rename ant/src/org/jetbrains/{jet/buildtools => kotlin}/ant/KotlinCompilerBaseTask.kt (98%)
 create mode 100644 ant/src/org/jetbrains/kotlin/ant/antlib.xml
 rename compiler/testData/integration/ant/js/{sourcemap => sourceMap}/build.log.expected (100%)
 rename compiler/testData/integration/ant/js/{sourcemap => sourceMap}/build.xml (64%)
 rename compiler/testData/integration/ant/js/{sourcemap => sourceMap}/root1/foo.kt (100%)

diff --git a/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml b/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
index 8af55eaf980..27b98125928 100644
--- a/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
+++ b/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
@@ -1,15 +1,7 @@
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- http://evgeny-goldin.org/javadoc/ant/Types/antlib.html -->
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-
+<!-- NOTE: this Antlib is deprecated. Use org/jetbrains/kotlin/ant/antlib.xml instead -->
+<!-- TODO: delete this file -->
 <antlib>
-    <taskdef
-        name      = "kotlinc"
-        classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JvmTask"/>
-    <taskdef
-        name      = "kotlin2js"
-        classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JsTask"/>
-    <typedef
-        name      = "withKotlin"
-        classname = "org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter"/>
+    <taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
+    <taskdef name="kotlin2js" classname="org.jetbrains.kotlin.ant.Kotlin2JsTask"/>
+    <typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
 </antlib>
diff --git a/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
similarity index 96%
rename from ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt
rename to ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
index b499b089891..42942fd51d8 100644
--- a/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.buildtools.ant
+package org.jetbrains.kotlin.ant
 
 import org.apache.tools.ant.types.Path
 import java.io.File
diff --git a/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt
similarity index 96%
rename from ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt
rename to ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt
index cdfdd5d7dad..8701799639e 100644
--- a/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.buildtools.ant
+package org.jetbrains.kotlin.ant
 
 import org.apache.tools.ant.types.Path
 import org.apache.tools.ant.types.Reference
diff --git a/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java
similarity index 95%
rename from ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java
rename to ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java
index ed6458a39a0..9216a2ad3d9 100644
--- a/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.buildtools.ant;
+package org.jetbrains.kotlin.ant;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Javac;
diff --git a/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
similarity index 98%
rename from ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt
rename to ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
index d3da0cea4d4..067596656a8 100644
--- a/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.buildtools.ant
+package org.jetbrains.kotlin.ant
 
 import org.apache.tools.ant.Task
 import org.apache.tools.ant.types.Path
diff --git a/ant/src/org/jetbrains/kotlin/ant/antlib.xml b/ant/src/org/jetbrains/kotlin/ant/antlib.xml
new file mode 100644
index 00000000000..2d042ac53b8
--- /dev/null
+++ b/ant/src/org/jetbrains/kotlin/ant/antlib.xml
@@ -0,0 +1,5 @@
+<antlib>
+    <taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
+    <taskdef name="kotlin2js" classname="org.jetbrains.kotlin.ant.Kotlin2JsTask"/>
+    <typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
+</antlib>
diff --git a/compiler/testData/integration/ant/js/additionalArguments/build.xml b/compiler/testData/integration/ant/js/additionalArguments/build.xml
index 03b0b4f601b..d7f2d56a067 100644
--- a/compiler/testData/integration/ant/js/additionalArguments/build.xml
+++ b/compiler/testData/integration/ant/js/additionalArguments/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlin2js src="${test.data}/hello.kt" noStdlib="true" output="${temp}/out.js">
diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
index af46eb7631a..099ace2d290 100644
--- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
+++ b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1"
diff --git a/compiler/testData/integration/ant/js/manySources/build.xml b/compiler/testData/integration/ant/js/manySources/build.xml
index e2d9876848f..b7c38ad9744 100644
--- a/compiler/testData/integration/ant/js/manySources/build.xml
+++ b/compiler/testData/integration/ant/js/manySources/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" >
diff --git a/compiler/testData/integration/ant/js/noOutputParam/build.xml b/compiler/testData/integration/ant/js/noOutputParam/build.xml
index e44e5b23173..f5b1c0498d9 100644
--- a/compiler/testData/integration/ant/js/noOutputParam/build.xml
+++ b/compiler/testData/integration/ant/js/noOutputParam/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1"/>
diff --git a/compiler/testData/integration/ant/js/noSrcParam/build.xml b/compiler/testData/integration/ant/js/noSrcParam/build.xml
index 83ed284e942..e711ea6175c 100644
--- a/compiler/testData/integration/ant/js/noSrcParam/build.xml
+++ b/compiler/testData/integration/ant/js/noSrcParam/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js output="${temp}/out.js"/>
diff --git a/compiler/testData/integration/ant/js/outputPostfix/build.xml b/compiler/testData/integration/ant/js/outputPostfix/build.xml
index faec7db98a4..40666ba00b2 100644
--- a/compiler/testData/integration/ant/js/outputPostfix/build.xml
+++ b/compiler/testData/integration/ant/js/outputPostfix/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"  outputPostfix="${test.data}/postfix" />
diff --git a/compiler/testData/integration/ant/js/outputPrefix/build.xml b/compiler/testData/integration/ant/js/outputPrefix/build.xml
index 701dcab9dbc..0d7736a4e80 100644
--- a/compiler/testData/integration/ant/js/outputPrefix/build.xml
+++ b/compiler/testData/integration/ant/js/outputPrefix/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
diff --git a/compiler/testData/integration/ant/js/simple/build.xml b/compiler/testData/integration/ant/js/simple/build.xml
index 4f39f5e0ce7..3b3e641684b 100644
--- a/compiler/testData/integration/ant/js/simple/build.xml
+++ b/compiler/testData/integration/ant/js/simple/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
diff --git a/compiler/testData/integration/ant/js/simpleWithMain/build.xml b/compiler/testData/integration/ant/js/simpleWithMain/build.xml
index a005566494b..e6152353a71 100644
--- a/compiler/testData/integration/ant/js/simpleWithMain/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithMain/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" main="call"/>
diff --git a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
index dbadf1da772..609c55d4983 100644
--- a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
index a80ea4410f9..9b68b598242 100644
--- a/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
index a4bb60f224f..867814b7500 100644
--- a/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
   <property name="library.path" value="${test.data}/jslib-example.jar"/>
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
index 7c2815d2bb2..b09094d262a 100644
--- a/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
   <property name="library.path" value="${test.data}/jslib-example"/>
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
diff --git a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
index dbadf1da772..609c55d4983 100644
--- a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
diff --git a/compiler/testData/integration/ant/js/sourcemap/build.log.expected b/compiler/testData/integration/ant/js/sourceMap/build.log.expected
similarity index 100%
rename from compiler/testData/integration/ant/js/sourcemap/build.log.expected
rename to compiler/testData/integration/ant/js/sourceMap/build.log.expected
diff --git a/compiler/testData/integration/ant/js/sourcemap/build.xml b/compiler/testData/integration/ant/js/sourceMap/build.xml
similarity index 64%
rename from compiler/testData/integration/ant/js/sourcemap/build.xml
rename to compiler/testData/integration/ant/js/sourceMap/build.xml
index 25eb0ecc0f4..b2832f17917 100644
--- a/compiler/testData/integration/ant/js/sourcemap/build.xml
+++ b/compiler/testData/integration/ant/js/sourceMap/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" sourcemap="true"/>
diff --git a/compiler/testData/integration/ant/js/sourcemap/root1/foo.kt b/compiler/testData/integration/ant/js/sourceMap/root1/foo.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/sourcemap/root1/foo.kt
rename to compiler/testData/integration/ant/js/sourceMap/root1/foo.kt
diff --git a/compiler/testData/integration/ant/js/suppressWarnings/build.xml b/compiler/testData/integration/ant/js/suppressWarnings/build.xml
index 9f866514b62..99654710f06 100644
--- a/compiler/testData/integration/ant/js/suppressWarnings/build.xml
+++ b/compiler/testData/integration/ant/js/suppressWarnings/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" nowarn="true"/>
diff --git a/compiler/testData/integration/ant/js/verbose/build.xml b/compiler/testData/integration/ant/js/verbose/build.xml
index 13b6dba1188..23929c33fcb 100644
--- a/compiler/testData/integration/ant/js/verbose/build.xml
+++ b/compiler/testData/integration/ant/js/verbose/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" verbose="true"/>
diff --git a/compiler/testData/integration/ant/js/version/build.xml b/compiler/testData/integration/ant/js/version/build.xml
index 9313e6cb7ec..179131791ae 100644
--- a/compiler/testData/integration/ant/js/version/build.xml
+++ b/compiler/testData/integration/ant/js/version/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-  <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+  <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
     <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" printVersion="true"/>
diff --git a/compiler/testData/integration/ant/jvm/additionalArguments/build.xml b/compiler/testData/integration/ant/jvm/additionalArguments/build.xml
index adb0a9839fa..4537ecc1a75 100644
--- a/compiler/testData/integration/ant/jvm/additionalArguments/build.xml
+++ b/compiler/testData/integration/ant/jvm/additionalArguments/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar">
diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml
index 113c3040eb8..59389201291 100644
--- a/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml
+++ b/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml
@@ -1,23 +1,23 @@
 <project name="Ant Task Test" default="build">
 
-  <path id="classpath">
-    <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
-    <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
-  </path>
+    <path id="classpath">
+        <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
+        <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
+    </path>
 
-  <typedef name = "withKotlin" classname = "org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter"/>
+    <typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
 
-  <target name="build">
-      <delete dir="${temp}/classes" failonerror="false"/>
-      <mkdir dir="${temp}/classes"/>
-      <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
-        <classpath refid="classpath"/>
-        <withKotlin externalannotations="${test.data}/root1/b/">
-          <externalannotations path="${test.data}/root1/a/" />
-        </withKotlin>
-      </javac>
-      <jar destfile="${temp}/hello.jar">
-        <fileset dir="${temp}/classes"/>
-      </jar>
-  </target>
+    <target name="build">
+        <delete dir="${temp}/classes" failonerror="false"/>
+        <mkdir dir="${temp}/classes"/>
+        <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
+            <classpath refid="classpath"/>
+            <withKotlin externalannotations="${test.data}/root1/b/">
+                <externalannotations path="${test.data}/root1/a/"/>
+            </withKotlin>
+        </javac>
+        <jar destfile="${temp}/hello.jar">
+            <fileset dir="${temp}/classes"/>
+        </jar>
+    </target>
 </project>
diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml
index 17578e94069..81524f5e075 100644
--- a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml
+++ b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml
@@ -2,4 +2,4 @@
   <item name='j.Java java.lang.String f()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-</root>
\ No newline at end of file
+</root>
diff --git a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml
index 4d5d038491c..b2d319ef8aa 100644
--- a/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml
+++ b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml
@@ -2,4 +2,4 @@
   <item name='j.Java java.lang.String f2()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-</root>
\ No newline at end of file
+</root>
diff --git a/compiler/testData/integration/ant/jvm/helloWorld/build.xml b/compiler/testData/integration/ant/jvm/helloWorld/build.xml
index c5d0a6c090a..477829a1a7c 100644
--- a/compiler/testData/integration/ant/jvm/helloWorld/build.xml
+++ b/compiler/testData/integration/ant/jvm/helloWorld/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/>
diff --git a/compiler/testData/integration/ant/jvm/javacCompiler/build.xml b/compiler/testData/integration/ant/jvm/javacCompiler/build.xml
index 72e91b75d25..4881190d012 100644
--- a/compiler/testData/integration/ant/jvm/javacCompiler/build.xml
+++ b/compiler/testData/integration/ant/jvm/javacCompiler/build.xml
@@ -1,18 +1,18 @@
 <project name="Ant Task Test" default="build">
 
-  <path id="classpath">
-    <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
-  </path>
+    <path id="classpath">
+        <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
+    </path>
 
-  <target name="build">
+    <target name="build">
         <delete dir="${temp}/classes" failonerror="false"/>
         <mkdir dir="${temp}/classes"/>
-        <javac destdir="${temp}/classes" includeantruntime="false" compiler="org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter">
-          <src path="${test.data}/root1"/>
-          <classpath refid="classpath"/>
+        <javac destdir="${temp}/classes" includeantruntime="false" compiler="org.jetbrains.kotlin.ant.KotlinCompilerAdapter">
+            <src path="${test.data}/root1"/>
+            <classpath refid="classpath"/>
         </javac>
         <jar destfile="${temp}/hello.jar">
-          <fileset dir="${temp}/classes"/>
+            <fileset dir="${temp}/classes"/>
         </jar>
     </target>
 </project>
diff --git a/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml b/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml
index c5d0a6c090a..477829a1a7c 100644
--- a/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml
+++ b/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/>
diff --git a/compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml b/compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml
index 6241cdb30d0..a0212759f37 100644
--- a/compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml
+++ b/compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml
@@ -1,24 +1,24 @@
 <project name="Ant Task Test" default="build">
 
-  <path id="classpath">
-    <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
-    <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
-  </path>
+    <path id="classpath">
+        <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
+        <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
+    </path>
 
-  <taskdef name = "kotlinc" classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JvmTask"/>
+    <taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
 
-  <target name="build">
-      <delete dir="${temp}/classes" failonerror="false"/>
-      <mkdir dir="${temp}/classes"/>
-      <kotlinc output="${temp}/classes" src="${test.data}/root1" externalannotations="${test.data}/root1/b/">
-        <classpath refid="classpath"/>
-        <externalannotations path="${test.data}/root1/a/" />
-      </kotlinc>
-      <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
-        <classpath refid="classpath"/>
-      </javac>
-      <jar destfile="${temp}/hello.jar">
-        <fileset dir="${temp}/classes"/>
-      </jar>
-  </target>
+    <target name="build">
+        <delete dir="${temp}/classes" failonerror="false"/>
+        <mkdir dir="${temp}/classes"/>
+        <kotlinc output="${temp}/classes" src="${test.data}/root1" externalannotations="${test.data}/root1/b/">
+            <classpath refid="classpath"/>
+            <externalannotations path="${test.data}/root1/a/"/>
+        </kotlinc>
+        <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
+            <classpath refid="classpath"/>
+        </javac>
+        <jar destfile="${temp}/hello.jar">
+            <fileset dir="${temp}/classes"/>
+        </jar>
+    </target>
 </project>
diff --git a/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml
index 17578e94069..81524f5e075 100644
--- a/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml
+++ b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml
@@ -2,4 +2,4 @@
   <item name='j.Java java.lang.String f()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-</root>
\ No newline at end of file
+</root>
diff --git a/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml
index 4d5d038491c..b2d319ef8aa 100644
--- a/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml
+++ b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml
@@ -2,4 +2,4 @@
   <item name='j.Java java.lang.String f2()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-</root>
\ No newline at end of file
+</root>
diff --git a/compiler/testData/integration/ant/jvm/manySourceRoots/build.xml b/compiler/testData/integration/ant/jvm/manySourceRoots/build.xml
index f282219b632..fb7a8afcc42 100644
--- a/compiler/testData/integration/ant/jvm/manySourceRoots/build.xml
+++ b/compiler/testData/integration/ant/jvm/manySourceRoots/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc output="${temp}/hello.jar">
diff --git a/compiler/testData/integration/ant/jvm/suppressWarnings/build.xml b/compiler/testData/integration/ant/jvm/suppressWarnings/build.xml
index 92e56eeb094..a1d70ee5e1c 100644
--- a/compiler/testData/integration/ant/jvm/suppressWarnings/build.xml
+++ b/compiler/testData/integration/ant/jvm/suppressWarnings/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" nowarn="true" />
diff --git a/compiler/testData/integration/ant/jvm/verbose/build.xml b/compiler/testData/integration/ant/jvm/verbose/build.xml
index 2be0c50fa69..ad725934154 100644
--- a/compiler/testData/integration/ant/jvm/verbose/build.xml
+++ b/compiler/testData/integration/ant/jvm/verbose/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" verbose="true" />
diff --git a/compiler/testData/integration/ant/jvm/version/build.xml b/compiler/testData/integration/ant/jvm/version/build.xml
index 2d797fac56e..91b355b5680 100644
--- a/compiler/testData/integration/ant/jvm/version/build.xml
+++ b/compiler/testData/integration/ant/jvm/version/build.xml
@@ -1,5 +1,5 @@
 <project name="Ant Task Test" default="build">
-    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
         <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" printVersion="true" />
diff --git a/docs/confluence.jetbrains.com/Kotlin/40702623_Kotlin+Build+Tools.confluence b/docs/confluence.jetbrains.com/Kotlin/40702623_Kotlin+Build+Tools.confluence
index 3dab70fef07..25ef95b7f5d 100644
--- a/docs/confluence.jetbrains.com/Kotlin/40702623_Kotlin+Build+Tools.confluence
+++ b/docs/confluence.jetbrains.com/Kotlin/40702623_Kotlin+Build+Tools.confluence
@@ -8,7 +8,7 @@ One way to define Ant's {{*<kotlinc>*}} task is by using your local Kotlin setup
 
 {code:xml}
 <property environment="env"/>
-<taskdef resource    = "org/jetbrains/jet/buildtools/ant/antlib.xml">
+<taskdef resource    = "org/jetbrains/kotlin/ant/antlib.xml">
     <classpath>
         <fileset dir = "${env.KOTLIN_HOME}/lib" includes = "*.jar"/>
     </classpath>