Rearrange and rename idea-plugin related and annotation-processing modules

libraries/tools/kotlin-annotation-processing/build.gradle.kts

@@ -1,14 +1,28 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 description = "Annotation Processor wrapper for Kotlin"
 
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath("com.github.jengelman.gradle.plugins:shadow:1.2.3")
+    }
+}
+
 apply { plugin("kotlin") }
 
+val packedJars by configurations.creating
+
 dependencies {
-    compile(project(":plugins:kapt3"))
+    compile(project(":kotlin-annotation-processing"))
     compileOnly("org.jetbrains.kotlin:gradle-api:1.6")
     compileOnly("com.android.tools.build:gradle:1.1.0")
     compile(projectDist(":kotlin-stdlib"))
     testCompile(commonDep("junit:junit"))
+    packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
 }
 
 sourceSets {
@@ -20,10 +34,16 @@ projectTest {
     workingDir = projectDir
 }
 
-runtimeJar()
+val jar by tasks
+jar.apply {
+    enabled = false
+}
+
+runtimeJar(task<ShadowJar>("shadowJar")) {
+    from(packedJars)
+    from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
+}
 sourcesJar()
 javadocJar()
 
-dist()
-
 publish()

libraries/tools/kotlin-gradle-plugin/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     compile project(':compiler:compiler-runner')
     compile project(":compiler:incremental-compilation-impl")
     compile project(":compiler:daemon")
-    compile project(':kotlin-annotation-processing')
+    compile project(':kotlin-annotation-processing-gradle')
 
     compileOnly 'com.android.tools.build:gradle:2.0.0'
     compileOnly 'org.codehaus.groovy:groovy-all:2.3.9'

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt

@@ -78,7 +78,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
         val MAIN_KAPT_CONFIGURATION_NAME = "kapt"
 
         val KAPT_GROUP_NAME = "org.jetbrains.kotlin"
-        val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing"
+        val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing-gradle"
 
         fun getKaptConfigurationName(sourceSetName: String): String {
             return if (sourceSetName != "main")