Rename artifacts, fix dependencies and artifact contents

libraries/tools/kotlin-allopen/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 
     compile project(':kotlin-stdlib')
     compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')
-    compile project(':kotlin-allopen-compiler-plugin')
+    compileOnly project(':kotlin-allopen-compiler-plugin')
 
     compileOnly 'org.jetbrains.kotlin:gradle-api:1.6'
 }
@@ -32,8 +32,13 @@ def originalSrc = "$kotlin_root/plugins/allopen/allopen-cli/src"
 
 //compileKotlin.dependsOn preprocessSources
 
+evaluationDependsOn(":kotlin-allopen-compiler-plugin")
+
 jar {
-    from(originalSrc) { include("META-INF/**") }
+//    from(originalSrc) { include("META-INF/**") }
+    from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.classesDirs)
+    from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.resourcesDir)
+    manifestAttributes(manifest, project)
 }
 
 artifacts {

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

@@ -19,4 +19,8 @@ dependencies {
 artifacts {
     archives sourcesJar
     archives javadocJar
+}
+
+jar {
+    manifestAttributes(manifest, project)
 }

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

@@ -19,7 +19,7 @@ dependencies {
     testCompile project(path: ':examples:annotation-processor-example')
     testCompile project(':kotlin-stdlib-jre8')
     testCompile project(':kotlin-reflect')
-    testCompile project(':android-extensions-compiler')
+    testCompile project(':kotlin-android-extensions')
     testCompile project(path: ':kotlin-build-common', configuration: 'tests-jar')
     testCompile project(path: ':compiler:incremental-compilation-impl', configuration: 'tests-jar')
 

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

@@ -31,7 +31,7 @@ dependencies {
     compile project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
 
     compile project(':kotlin-stdlib')
-    compile project(':android-extensions-compiler')
+    compile project(':kotlin-android-extensions')
     compile project(':kotlin-build-common')
     compile project(':kotlin-compiler-runner')
 //    compileOnly project(":compiler:daemon")
@@ -81,6 +81,7 @@ jar.dependsOn agp25Classes
 jar {
     from compileGroovy.destinationDir
     from sourceSets.agp25.output.classesDir
+    manifestAttributes(manifest, project)
 }
 
 artifacts {

libraries/tools/kotlin-noarg/build.gradle

@@ -20,7 +20,7 @@ dependencies {
 
     compile project(':kotlin-stdlib')
     compileOnly project(':compiler')
-    compile project(':kotlin-noarg-compiler-plugin')
+    compileOnly project(':kotlin-noarg-compiler-plugin')
 
     compileOnly 'org.jetbrains.kotlin:gradle-api:1.6'
 }
@@ -38,8 +38,13 @@ def originalSrc = "$kotlin_root/plugins/noarg/noarg-cli/src"
 
 //compileKotlin.dependsOn preprocessSources
 
+evaluationDependsOn(":kotlin-noarg-compiler-plugin")
+
 jar {
-    from(originalSrc) { include("META-INF/**") }
+//    from(originalSrc) { include("META-INF/**") }
+    from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.classesDirs)
+    from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.resourcesDir)
+    manifestAttributes(manifest, project)
 }
 
 artifacts {

libraries/tools/kotlin-sam-with-receiver/build.gradle

@@ -20,7 +20,7 @@ dependencies {
 
     compile project(':kotlin-stdlib')
     compileOnly project(':compiler')
-    compile project(':kotlin-sam-with-receiver-compiler-plugin')
+    compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
 
     compileOnly 'org.jetbrains.kotlin:gradle-api:1.6'
 }
@@ -38,8 +38,13 @@ def originalSrc = "$kotlin_root/plugins/sam-with-receiver/sam-with-receiver-cli/
 
 //compileKotlin.dependsOn preprocessSources
 
+evaluationDependsOn(":kotlin-sam-with-receiver-compiler-plugin")
+
 jar {
-    from(originalSrc) { include("META-INF/**") }
+//    from(originalSrc) { include("META-INF/**") }
+    from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.classesDirs)
+    from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.resourcesDir)
+    manifestAttributes(manifest, project)
 }
 
 artifacts {