Add missing artifact, fix some deps and publishing

buildSrc/src/main/kotlin/artifacts.kt

@@ -15,6 +15,8 @@ import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.jvm.tasks.Jar
 import java.io.File
 
+// can be used now only for the non-published projects, due to conflicts in the "archives" config
+// TODO: fix the problem above
 fun Project.classesDirsArtifact(): FileCollection {
     val classesDirsCfg = configurations.getOrCreate("classes-dirs")
 

compiler/compiler-runner/build.gradle.kts

@@ -1,9 +1,14 @@
 
+description = "Compiler runner + daemon client"
+
 apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+val packIntoJar by configurations.creating
+
 dependencies {
+    val compile by configurations
     compile(project(":kotlin-build-common"))
     compile(project(":compiler:cli-common"))
     compile(project(":kotlin-preloader"))
@@ -11,6 +16,7 @@ dependencies {
     compile(project(":compiler:daemon-common"))
     compile(project(":kotlin-daemon-client"))
     compile(project(":compiler:util"))
+    packIntoJar(projectClasses(":compiler:daemon-common"))
 }
 
 sourceSets {
@@ -18,3 +24,13 @@ sourceSets {
     "test" {}
 }
 
+evaluationDependsOn(":kotlin-daemon-client")
+
+runtimeJar {
+    from(packIntoJar)
+    from(project(":kotlin-daemon-client").the<JavaPluginConvention>().sourceSets["main"].output.classesDirs)
+}
+sourcesJar()
+javadocJar()
+
+publish()

compiler/daemon/daemon-client/build.gradle.kts

@@ -7,11 +7,14 @@ jvmTarget = "1.6"
 
 val nativePlatformUberjar = preloadedDeps("native-platform-uberjar")
 
+val packIntoJar by configurations.creating
+
 dependencies {
     compileOnly(project(":compiler:util"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":compiler:daemon-common"))
     compileOnly(nativePlatformUberjar)
+    packIntoJar(projectClasses(":compiler:daemon-common"))
 }
 
 sourceSets {
@@ -23,8 +26,10 @@ runtimeJar {
     nativePlatformUberjar.forEach {
         from(zipTree(it))
     }
+    from(packIntoJar)
 }
 sourcesJar()
+javadocJar()
 
 dist()
 

compiler/daemon/daemon-common/build.gradle.kts

@@ -16,3 +16,4 @@ sourceSets {
     "test" {}
 }
 
+classesDirsArtifact()

gradle/project-schema.json

@@ -856,7 +856,7 @@
             "signing": "org.gradle.plugins.signing.SigningExtension"
         }
     },
-    ":kotlin-daemon-client": {
+    ":kotlin-compiler-runner": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
             "java": "org.gradle.api.plugins.JavaPluginConvention",
@@ -870,10 +870,53 @@
             "compileClasspath",
             "compileOnly",
             "default",
+            "implementation",
+            "kapt",
+            "kaptTest",
+            "packIntoJar",
+            "runtime",
+            "runtimeClasspath",
+            "runtimeElements",
+            "runtimeJar",
+            "runtimeOnly",
+            "signatures",
+            "testCompile",
+            "testCompileClasspath",
+            "testCompileOnly",
+            "testImplementation",
+            "testRuntime",
+            "testRuntimeClasspath",
+            "testRuntimeOnly"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension",
+            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "signing": "org.gradle.plugins.signing.SigningExtension"
+        }
+    },
+    ":kotlin-daemon-client": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention",
+            "maven": "org.gradle.api.plugins.MavenPluginConvention"
+        },
+        "configurations": [
+            "apiElements",
+            "archives",
+            "buildVersion",
+            "classes-dirs",
+            "compile",
+            "compileClasspath",
+            "compileOnly",
+            "default",
             "distJar",
             "implementation",
             "kapt",
             "kaptTest",
+            "packIntoJar",
             "runtime",
             "runtimeClasspath",
             "runtimeElements",
@@ -2061,41 +2104,6 @@
             "reporting": "org.gradle.api.reporting.ReportingExtension"
         }
     },
-    ":compiler:compiler-runner": {
-        "conventions": {
-            "base": "org.gradle.api.plugins.BasePluginConvention",
-            "java": "org.gradle.api.plugins.JavaPluginConvention"
-        },
-        "configurations": [
-            "apiElements",
-            "archives",
-            "compile",
-            "compileClasspath",
-            "compileOnly",
-            "default",
-            "implementation",
-            "kapt",
-            "kaptTest",
-            "runtime",
-            "runtimeClasspath",
-            "runtimeElements",
-            "runtimeOnly",
-            "testCompile",
-            "testCompileClasspath",
-            "testCompileOnly",
-            "testImplementation",
-            "testRuntime",
-            "testRuntimeClasspath",
-            "testRuntimeOnly"
-        ],
-        "extensions": {
-            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
-            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension",
-            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
-            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension"
-        }
-    },
     ":compiler:conditional-preprocessor": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
@@ -2210,6 +2218,7 @@
         "configurations": [
             "apiElements",
             "archives",
+            "classes-dirs",
             "compile",
             "compileClasspath",
             "compileOnly",

idea/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     compile(project(":js:js.serializer"))
     compile(project(":compiler:light-classes"))
     compile(project(":compiler:util"))
-    compile(project(":compiler:compiler-runner"))
+    compile(project(":kotlin-compiler-runner"))
     compile(project(":compiler:plugin-api"))
     compile(project(":eval4j"))
     compile(project(":j2k"))

jps-plugin/build.gradle.kts

@@ -5,7 +5,7 @@ val compilerModules: Array<String> by rootProject.extra
 dependencies {
     compile(project(":kotlin-build-common"))
     compile(project(":core"))
-    compile(project(":compiler:compiler-runner"))
+    compile(project(":kotlin-compiler-runner"))
     compile(project(":compiler:daemon-common"))
     compile(projectDist(":kotlin-daemon-client"))
     compile(project(":compiler:frontend.java"))

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

@@ -33,7 +33,7 @@ dependencies {
     compile project(':android-extensions-compiler')
 //    compile project(path: ':compiler', configuration: 'embeddableCompilerJar')
     compile project(':kotlin-build-common')
-    compile project(':compiler:compiler-runner')
+    compile project(':kotlin-compiler-runner')
     compile project(":compiler:incremental-compilation-impl")
     compile project(":compiler:daemon")
     compile project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")

plugins/android-extensions/android-extensions-compiler/build.gradle.kts

@@ -3,8 +3,6 @@ description = "Kotlin Android Extensions Compiler"
 
 apply { plugin("kotlin") }
 
-val packIntoJar by configurations.creating
-
 dependencies {
     compile(ideaSdkCoreDeps("intellij-core"))
     compile(project(":compiler:util"))
@@ -13,7 +11,6 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:backend"))
     compileOnly(project(":kotlin-android-extensions-runtime"))
-    packIntoJar(projectClasses(":kotlin-android-extensions-runtime"))
 }
 
 sourceSets {
@@ -21,8 +18,10 @@ sourceSets {
     "test" {}
 }
 
+evaluationDependsOn(":kotlin-android-extensions-runtime")
+
 runtimeJar {
-    from(packIntoJar)
+    from(project(":kotlin-android-extensions-runtime").the<JavaPluginConvention>().sourceSets["main"].output.classesDirs)
 }
 
 dist()

plugins/android-extensions/android-extensions-runtime/build.gradle.kts

@@ -31,6 +31,4 @@ sourceSets {
 
 runtimeJar ()
 
-classesDirsArtifact()
-
 publish()

prepare/jps-plugin/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 val projectsToShadow = listOf(
         ":kotlin-build-common",
         ":compiler:cli-common",
-        ":compiler:compiler-runner",
+        ":kotlin-compiler-runner",
         ":kotlin-daemon-client",
         ":compiler:daemon-common",
         ":core",

settings.gradle

@@ -26,7 +26,7 @@ include ":kotlin-build-common",
         ":compiler:frontend",
         ":compiler:frontend.java",
         ":compiler:frontend.script",
-        ":compiler:compiler-runner",
+        ":kotlin-compiler-runner",
         ":compiler:cli-common",
         ":compiler:ir.tree",
         ":compiler:ir.psi2ir",
@@ -160,6 +160,7 @@ project(':compiler:cli-common').projectDir = "$rootDir/compiler/cli/cli-common"
 project(':kotlin-runner').projectDir = "$rootDir/compiler/cli/cli-runner" as File
 project(':compiler:daemon-common').projectDir = "$rootDir/compiler/daemon/daemon-common" as File
 project(':kotlin-daemon-client').projectDir = "$rootDir/compiler/daemon/daemon-client" as File
+project(':kotlin-compiler-runner').projectDir = "$rootDir/compiler/compiler-runner" as File
 project(':kotlin-ant').projectDir = "$rootDir/ant" as File
 project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File
 project(':compiler:ir.psi2ir').projectDir = "$rootDir/compiler/ir/ir.psi2ir" as File