Switch kotlinx-coroutines usages to regular dependency

build.gradle.kts

@@ -15,6 +15,8 @@ buildscript {
             bootstrapKotlinRepo,
             "https://jcenter.bintray.com/",
             "https://plugins.gradle.org/m2")
+            "https://plugins.gradle.org/m2",
+            "http://dl.bintray.com/kotlin/kotlinx")
 
     extra["repos"] = repos
 
@@ -120,6 +122,8 @@ extra["versions.junit"] = "4.12"
 extra["versions.javaslang"] = "2.0.6"
 extra["versions.ant"] = "1.8.2"
 extra["versions.android"] = "2.3.1"
+extra["versions.kotlinx-coroutines-core"] = "0.14.1"
+extra["versions.kotlinx-coroutines-jdk8"] = "0.14.1"
 
 // the former "ideaSdk/core" dir contents without intellij-core.jar
 extra["IntellijCoreDependencies"] =

compiler/frontend.script/build.gradle.kts

@@ -7,8 +7,8 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(projectDist(":kotlin-stdlib"))
-    compileOnly(project(":kotlin-reflect-api"))
-    compile(preloadedDeps("kotlinx-coroutines-core"))
+    compile(projectDist(":kotlin-reflect-api"))
+    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 }
 
 sourceSets {

idea/build.gradle.kts

@@ -36,7 +36,8 @@ dependencies {
     compile(project(":plugins:uast-kotlin-idea"))
     compile(project(":kotlin-script-util")) { isTransitive = false }
 
-    compile(preloadedDeps("markdown", "kotlinx-coroutines-core"))
+    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    compile(preloadedDeps("markdown"))
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))

idea/idea-core/build.gradle.kts

@@ -19,7 +19,8 @@ dependencies {
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-jps-common"))
     compile(project(":plugins:android-extensions-compiler"))
-    compile(preloadedDeps("kotlinx-coroutines-core", "kotlinx-coroutines-jdk8"))
+    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
 }
 
 afterEvaluate {

prepare/compiler/build.gradle.kts

@@ -69,8 +69,8 @@ dependencies {
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
     fatJarContents(protobufFull())
     fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
-    fatJarContents(commonDep("io.javaslang", "javaslang")) { isTransitive = false }
-    fatJarContents(preloadedDeps("kotlinx-coroutines-core"))
+    fatJarContents(commonDep("io.javaslang", "javaslang"))
+    fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     proguardLibraryJars(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar"),
             firstFromJavaHomeThatExists("lib/jsse.jar", "../Classes/jsse.jar"),

prepare/idea-plugin/build.gradle.kts

@@ -1,19 +1,3 @@
-/*
- * Copyright 2010-2017 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.jvm.tasks.Jar
@@ -87,7 +71,9 @@ dependencies {
     sideJars(project(":kotlin-compiler-client-embeddable"))
     sideJars(commonDep("io.javaslang", "javaslang"))
     sideJars(commonDep("javax.inject"))
-    sideJars(preloadedDeps("markdown", "kotlinx-coroutines-core", "kotlinx-coroutines-jdk8"))
+    sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
+    sideJars(preloadedDeps("markdown"))
 }
 
 val jar = runtimeJar(task<ShadowJar>("shadowJar")) {

ultimate/build.gradle.kts

@@ -67,7 +67,7 @@ dependencies {
     testCompile(projectTests(":idea")) { isTransitive = false }
     testCompile(projectTests(":generators:test-generator"))
     testCompile(commonDep("junit:junit"))
-    testCompile(preloadedDeps("kotlinx-coroutines-core"))
+    testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     testRuntime(projectDist(":kotlin-reflect"))
     testRuntime(projectDist(":kotlin-script-runtime"))

update_dependencies.xml

@@ -230,14 +230,6 @@
         <get-maven-library prefix="org/apache/maven" lib="maven-ant-tasks" version="2.1.3"
                            target.jar.name.base="maven-ant-tasks" download="${dependencies}/robolectric" />
 
-        <!-- kotlinx.coroutines -->
-        <get-maven-library prefix="org/jetbrains/kotlinx" lib="kotlinx-coroutines-core" version="${kotlinx.coroutines.version}"
-                           target.jar.name.base="kotlinx-coroutines-core" server="http://dl.bintray.com/kotlin/kotlinx/"/>
-
-        <get-maven-library prefix="org/jetbrains/kotlinx" lib="kotlinx-coroutines-jdk8" version="${kotlinx.coroutines.version}"
-                           target.jar.name.base="kotlinx-coroutines-jdk8" server="http://dl.bintray.com/kotlin/kotlinx/"/>
-
-
         <delete file="${dependencies}/android.jar" failonerror="false"/>
         <get src="http://dl-ssl.google.com/android/repository/android-19_r02.zip"
              dest="${dependencies}/download/android-sdk.zip" usetimestamp="true"/>