Implement publishing in the build

compiler/backend-common/build.gradle.kts

@@ -7,6 +7,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:ir.tree"))
+    compile(project(":compiler:cli-common"))
 }
 
 configureKotlinProjectSources("backend-common/src", "ir/backend.common/src", sourcesBaseDir = File(rootDir, "compiler"))

compiler/build.gradle.kts

@@ -77,7 +77,7 @@ dependencies {
     compileOnly(project(":build-common"))
     compileOnly(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
     compileOnly(commonDep("org.fusesource.jansi", "jansi"))
-    compileOnly(commonDep("jline"))
+    compileOnly(commonDep("org.jline", "jline"))
 
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
@@ -108,7 +108,7 @@ dependencies {
     fatJarContents(ideaSdkDeps("jna-platform", "oromatcher"))
     fatJarContents(ideaSdkDeps("jps-model.jar", subdir = "jps"))
     fatJarContents(commonDep("javax.inject"))
-    fatJarContents(commonDep("jline"))
+    fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(protobufFull())
     fatJarContents(commonDep("com.github.spullara.cli-parser", "cli-parser"))
     fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
@@ -118,9 +118,9 @@ dependencies {
     proguardLibraryJars(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar"),
                               firstFromJavaHomeThatExists("lib/jsse.jar", "../Classes/jsse.jar"),
                               firstFromJavaHomeThatExists("../lib/tools.jar", "../Classes/tools.jar")))
-    proguardLibraryJars(kotlinDep("stdlib"))
-    proguardLibraryJars(kotlinDep("script-runtime"))
-    proguardLibraryJars(kotlinDep("reflect"))
+    proguardLibraryJars(project(":kotlin-stdlib", configuration = "mainJar"))
+    proguardLibraryJars(project(":kotlin-script-runtime", configuration = "mainJar"))
+    proguardLibraryJars(project(":kotlin-reflect", configuration = "mainJar"))
     proguardLibraryJars(preloadedDeps("kotlinx-coroutines-core"))
 
 //    proguardLibraryJars(project(":prepare:runtime", configuration = "default").apply { isTransitive = false })

compiler/cli/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compile(project(":js:js.dce"))
     compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
     compile(commonDep("org.fusesource.jansi", "jansi"))
-    compile(commonDep("jline"))
+    compile(commonDep("org.jline", "jline"))
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 }
 

compiler/cli/cli-runner/build.gradle.kts

@@ -5,7 +5,7 @@ apply { plugin("kotlin") }
 
 dependencies {
     val compile by configurations
-    compile(kotlinDep("stdlib"))
+    compile(project(":kotlin-stdlib"))
     buildVersion()
 }
 

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -498,7 +498,7 @@ class KotlinCoreEnvironment private constructor(
             val pluginRoot =
                     configuration.get(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT)?.let(::File)
                     ?: configuration.get(CLIConfigurationKeys.COMPILER_JAR_LOCATOR)?.compilerJar
-                    ?: PathUtil.getPathUtilJar().takeIf { it.hasConfigFile(configFilePath) }
+                    ?: PathUtil.pathUtilJar.takeIf { it.hasConfigFile(configFilePath) }
                     // hack for load extensions when compiler run directly from project directory (e.g. in tests)
                     ?: File("idea/src").takeIf { it.hasConfigFile(configFilePath) }
                     ?: throw IllegalStateException("Unable to find extension point configuration $configFilePath")

compiler/frontend.script/build.gradle.kts

@@ -5,7 +5,7 @@ dependencies {
     val compile by configurations
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compile(kotlinDep("reflect"))
+    compile(project(":kotlin-reflect"))
     compile(preloadedDeps("kotlinx-coroutines-core"))
 }
 

compiler/frontend/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:container"))
     compile(project(":compiler:resolution"))
-    compile(kotlinDep("script-runtime"))
+    compile(project(":kotlin-script-runtime"))
     compile(commonDep("io.javaslang","javaslang"))
 }