diff --git a/build.gradle.kts b/build.gradle.kts index 7442fdc92cb..1bce0247fdb 100644 --- a/build.gradle.kts +++ b/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"] = diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts index 7bbb79981b4..4fc1f6b2c67 100644 --- a/compiler/frontend.script/build.gradle.kts +++ b/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 { diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index af42f8d0d5c..c5b44858cc6 100644 --- a/idea/build.gradle.kts +++ b/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")) diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 631a36454ae..8f91945b58a 100644 --- a/idea/idea-core/build.gradle.kts +++ b/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 { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index ba61a92b57a..81dca8bbbb0 100644 --- a/prepare/compiler/build.gradle.kts +++ b/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"), diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index dbd357c324a..6881d6887a2 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/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")) { diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 13bfe92b412..acda98935cc 100644 --- a/ultimate/build.gradle.kts +++ b/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")) diff --git a/update_dependencies.xml b/update_dependencies.xml index daf1460d0a5..94b5ad42dba 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -230,14 +230,6 @@ - - - - - -