From a18770fbbb62ed877ab3f40572e5d1bdb8f984cf Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 2 Aug 2018 17:22:13 +0300 Subject: [PATCH] Remove projectDist dependency helper usages Use default configuration dependencies instead of projectDist ones. --- ant/build.gradle.kts | 2 +- build-common/build.gradle.kts | 4 ++-- compiler/build.gradle.kts | 10 +++++----- compiler/cli/cli-runner/build.gradle.kts | 2 +- compiler/container/build.gradle.kts | 8 ++++---- compiler/daemon/daemon-common/build.gradle.kts | 2 +- compiler/frontend.script/build.gradle.kts | 2 +- compiler/incremental-compilation-impl/build.gradle.kts | 4 ++-- compiler/tests-common-jvm6/build.gradle.kts | 4 ++-- compiler/tests-common/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts.173 | 2 +- compiler/tests-common/build.gradle.kts.181 | 2 +- compiler/tests-java8/build.gradle.kts | 2 +- compiler/util/build.gradle.kts | 2 +- core/descriptors/build.gradle.kts | 2 +- core/metadata/build.gradle.kts | 2 +- core/util.runtime/build.gradle.kts | 2 +- eval4j/build.gradle.kts | 4 ++-- generators/build.gradle.kts | 2 +- generators/build.gradle.kts.as31 | 2 +- generators/build.gradle.kts.as32 | 2 +- generators/build.gradle.kts.as33 | 2 +- generators/test-generator/build.gradle.kts | 2 +- idea/build.gradle.kts | 6 +++--- idea/build.gradle.kts.173 | 6 +++--- idea/build.gradle.kts.as31 | 6 +++--- idea/build.gradle.kts.as32 | 6 +++--- idea/build.gradle.kts.as33 | 6 +++--- idea/idea-android/build.gradle.kts | 4 ++-- idea/idea-android/build.gradle.kts.173 | 4 ++-- idea/idea-android/build.gradle.kts.as31 | 4 ++-- idea/idea-android/build.gradle.kts.as32 | 4 ++-- idea/idea-android/build.gradle.kts.as33 | 4 ++-- idea/idea-core/build.gradle.kts | 2 +- idea/idea-gradle/build.gradle.kts | 2 +- idea/idea-gradle/build.gradle.kts.173 | 2 +- idea/idea-gradle/build.gradle.kts.as31 | 2 +- idea/idea-gradle/build.gradle.kts.as32 | 2 +- idea/idea-gradle/build.gradle.kts.as33 | 2 +- idea/idea-jps-common/build.gradle.kts | 2 +- idea/idea-maven/build.gradle.kts | 2 +- idea/idea-maven/build.gradle.kts.173 | 2 +- idea/idea-maven/build.gradle.kts.as31 | 2 +- idea/idea-maven/build.gradle.kts.as32 | 2 +- idea/idea-maven/build.gradle.kts.as33 | 2 +- idea/kotlin-gradle-tooling/build.gradle.kts | 2 +- j2k/build.gradle.kts | 4 ++-- j2k/build.gradle.kts.173 | 4 ++-- j2k/build.gradle.kts.as31 | 4 ++-- j2k/build.gradle.kts.as32 | 4 ++-- j2k/build.gradle.kts.as33 | 4 ++-- jps-plugin/build.gradle.kts | 6 +++--- jps-plugin/build.gradle.kts.173 | 6 +++--- jps-plugin/build.gradle.kts.as31 | 6 +++--- jps-plugin/build.gradle.kts.as32 | 6 +++--- jps-plugin/build.gradle.kts.as33 | 4 ++-- js/js.tests/build.gradle.kts | 10 +++++----- .../annotation-processor-example/build.gradle.kts | 2 +- .../build.gradle.kts | 6 +++--- .../kotlin-jsr223-local-example/build.gradle.kts | 6 +++--- libraries/kotlinx-metadata/jvm/build.gradle.kts | 2 +- libraries/reflect/build.gradle.kts | 2 +- .../kotlin-annotation-processing/build.gradle.kts | 2 +- libraries/tools/kotlin-script-util/build.gradle.kts | 2 +- .../tools/kotlin-script-util/build.gradle.kts.173 | 2 +- .../tools/kotlin-script-util/build.gradle.kts.as32 | 2 +- plugins/allopen/allopen-cli/build.gradle.kts | 2 +- .../android-extensions-compiler/build.gradle.kts | 2 +- .../android-extensions-idea/build.gradle.kts | 4 ++-- .../android-extensions-idea/build.gradle.kts.173 | 4 ++-- .../android-extensions-idea/build.gradle.kts.as31 | 4 ++-- .../android-extensions-idea/build.gradle.kts.as32 | 4 ++-- .../android-extensions-idea/build.gradle.kts.as33 | 4 ++-- .../android-extensions-jps/build.gradle.kts | 2 +- .../android-extensions-jps/build.gradle.kts.173 | 2 +- .../android-extensions-jps/build.gradle.kts.as31 | 2 +- .../android-extensions-jps/build.gradle.kts.as33 | 2 +- .../android-extensions-runtime/build.gradle.kts | 2 +- plugins/kapt3/kapt3-base/build.gradle.kts | 2 +- plugins/kapt3/kapt3-idea/build.gradle.kts | 2 +- plugins/kapt3/kapt3-runtime/build.gradle.kts | 2 +- .../kotlin-serialization-compiler/build.gradle.kts | 2 +- plugins/noarg/noarg-cli/build.gradle.kts | 2 +- .../source-sections-compiler/build.gradle.kts | 2 +- plugins/uast-kotlin-idea/build.gradle.kts | 2 +- plugins/uast-kotlin/build.gradle.kts | 6 +++--- plugins/uast-kotlin/build.gradle.kts.173 | 6 +++--- prepare/compiler-client-embeddable/build.gradle.kts | 10 +++++----- prepare/idea-plugin/build.gradle.kts | 6 +++--- ultimate/build.gradle.kts | 6 +++--- ultimate/build.gradle.kts.173 | 6 +++--- ultimate/build.gradle.kts.as31 | 6 +++--- ultimate/build.gradle.kts.as32 | 6 +++--- 93 files changed, 164 insertions(+), 164 deletions(-) diff --git a/ant/build.gradle.kts b/ant/build.gradle.kts index 0378e42116a..cea33863913 100644 --- a/ant/build.gradle.kts +++ b/ant/build.gradle.kts @@ -8,7 +8,7 @@ plugins { dependencies { compile(commonDep("org.apache.ant", "ant")) compile(project(":kotlin-preloader")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) } sourceSets { diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index b84dbc23abb..cb35dd17c72 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -21,10 +21,10 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(protobufFull()) - testCompile(projectDist(":kotlin-stdlib")) + testCompile(project(":kotlin-stdlib")) testCompileOnly(intellijDep()) { includeJars("openapi") } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } sourceSets { diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 40b5ddf7548..8a3cf4d2def 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -67,11 +67,11 @@ dependencies { testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests depDistProjects.forEach { - testCompile(projectDist(it)) + testCompile(project(it)) } testCompile(commonDep("junit:junit")) - testCompileOnly(projectDist(":kotlin-test:kotlin-test-jvm")) - testCompileOnly(projectDist(":kotlin-test:kotlin-test-junit")) + testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) + testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":generators:test-generator")) testCompile(project(":compiler:ir.ir2cfg")) @@ -86,8 +86,8 @@ dependencies { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all") } - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-daemon-client")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-daemon-client")) testRuntime(androidDxJar()) testRuntime(files(toolsJar())) diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts index c5a73f8cf3e..f541cb1c1d5 100644 --- a/compiler/cli/cli-runner/build.gradle.kts +++ b/compiler/cli/cli-runner/build.gradle.kts @@ -9,7 +9,7 @@ plugins { jvmTarget = "1.6" dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) } sourceSets { diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts index 089acd68f12..b62c4db9b67 100644 --- a/compiler/container/build.gradle.kts +++ b/compiler/container/build.gradle.kts @@ -9,11 +9,11 @@ jvmTarget = "1.6" dependencies { compile(project(":core:util.runtime")) compile(commonDep("javax.inject")) - compileOnly(projectDist(":kotlin-stdlib")) + compileOnly(project(":kotlin-stdlib")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(projectDist(":kotlin-stdlib")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-stdlib")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } testRuntime(intellijDep()) { includeJars("trove4j") } diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts index 81398cc6b66..13a84bc0cf2 100644 --- a/compiler/daemon/daemon-common/build.gradle.kts +++ b/compiler/daemon/daemon-common/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compile(project(":core:descriptors.jvm")) compile(project(":compiler:util")) compile(project(":compiler:cli-common")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compileOnly(project(":js:js.frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts index e184cc5438a..a3a44258783 100644 --- a/compiler/frontend.script/build.gradle.kts +++ b/compiler/frontend.script/build.gradle.kts @@ -10,7 +10,7 @@ jvmTarget = "1.6" dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compileOnly(project(":kotlin-reflect-api")) compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } compileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index b1db241ecca..19e42028f93 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { compileOnly(intellijDep()) { includeJars("annotations") } testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) - testCompile(projectDist(":kotlin-stdlib")) + testCompile(project(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-stdlib")) testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts index ee96b18cdb5..642f111e36c 100644 --- a/compiler/tests-common-jvm6/build.gradle.kts +++ b/compiler/tests-common-jvm6/build.gradle.kts @@ -7,8 +7,8 @@ plugins { jvmTarget = "1.6" dependencies { - compile(projectDist(":kotlin-stdlib")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + compile(project(":kotlin-stdlib")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) } sourceSets { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index f496aae35c4..37edc9ca3fc 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testCompile(project(":js:js.frontend")) testCompile(project(":js:js.translator")) testCompileOnly(project(":plugins:android-extensions-compiler")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common-jvm6")) testCompileOnly(project(":kotlin-reflect-api")) testCompile(commonDep("junit:junit")) diff --git a/compiler/tests-common/build.gradle.kts.173 b/compiler/tests-common/build.gradle.kts.173 index 6fb1115857d..6a469f7008f 100644 --- a/compiler/tests-common/build.gradle.kts.173 +++ b/compiler/tests-common/build.gradle.kts.173 @@ -24,7 +24,7 @@ dependencies { testCompile(project(":js:js.frontend")) testCompile(project(":js:js.translator")) testCompileOnly(project(":plugins:android-extensions-compiler")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common-jvm6")) testCompileOnly(project(":kotlin-reflect-api")) testCompile(commonDep("junit:junit")) diff --git a/compiler/tests-common/build.gradle.kts.181 b/compiler/tests-common/build.gradle.kts.181 index f42092dd065..3baaf743ea4 100644 --- a/compiler/tests-common/build.gradle.kts.181 +++ b/compiler/tests-common/build.gradle.kts.181 @@ -24,7 +24,7 @@ dependencies { testCompile(project(":js:js.frontend")) testCompile(project(":js:js.translator")) testCompileOnly(project(":plugins:android-extensions-compiler")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common-jvm6")) testCompileOnly(project(":kotlin-reflect-api")) testCompile(commonDep("junit:junit")) diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 5652a8af2ce..af0fed724d3 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } testCompile(projectTests(":generators:test-generator")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(intellijDep()) } diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts index d0a2d7d6500..928a9bbc5f5 100644 --- a/compiler/util/build.gradle.kts +++ b/compiler/util/build.gradle.kts @@ -7,7 +7,7 @@ plugins { jvmTarget = "1.6" dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:deserialization")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts index 6f84640ffa3..c885799b26b 100644 --- a/core/descriptors/build.gradle.kts +++ b/core/descriptors/build.gradle.kts @@ -8,7 +8,7 @@ javaHome = rootProject.extra["JDK_16"] as String dependencies { compile(project(":core:util.runtime")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":kotlin-annotations-jvm")) } diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts index 18caa77fdca..8ea40fca9e0 100644 --- a/core/metadata/build.gradle.kts +++ b/core/metadata/build.gradle.kts @@ -10,7 +10,7 @@ javaHome = rootProject.extra["JDK_16"] as String dependencies { compile(protobufLite()) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) } sourceSets { diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts index a6d9d917b3e..6f29bb57dab 100644 --- a/core/util.runtime/build.gradle.kts +++ b/core/util.runtime/build.gradle.kts @@ -9,7 +9,7 @@ jvmTarget = "1.6" javaHome = rootProject.extra["JDK_16"] as String dependencies { - compileOnly(projectDist(":kotlin-stdlib")) + compileOnly(project(":kotlin-stdlib")) } sourceSets { diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts index 94f823816c7..0575c9e1676 100644 --- a/eval4j/build.gradle.kts +++ b/eval4j/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:backend")) compile(files(toolsJar())) compileOnly(intellijDep()) { includeJars("asm-all") } - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompile(intellijDep()) { includeJars("asm-all") } } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 868e993f697..b8893d8b9d4 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { testCompile(intellijDep("jps-build-test")) testCompile(builtinsSourceSet.output) testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } diff --git a/generators/build.gradle.kts.as31 b/generators/build.gradle.kts.as31 index 2d76692f182..f08d1f92262 100644 --- a/generators/build.gradle.kts.as31 +++ b/generators/build.gradle.kts.as31 @@ -33,7 +33,7 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testCompile(builtinsSourceSet.output) testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } diff --git a/generators/build.gradle.kts.as32 b/generators/build.gradle.kts.as32 index 4dcd0f33382..f8f5c882fb6 100644 --- a/generators/build.gradle.kts.as32 +++ b/generators/build.gradle.kts.as32 @@ -33,7 +33,7 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testCompile(builtinsSourceSet.output) testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } diff --git a/generators/build.gradle.kts.as33 b/generators/build.gradle.kts.as33 index 4dcd0f33382..f8f5c882fb6 100644 --- a/generators/build.gradle.kts.as33 +++ b/generators/build.gradle.kts.as33 @@ -33,7 +33,7 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testCompile(builtinsSourceSet.output) testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index 3f89e930239..fd2c39195b3 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(intellijDep()) { includeJars("util") } testCompile(project(":core:util.runtime")) testCompile(projectTests(":compiler:tests-common")) - testCompile(projectDist(":kotlin-stdlib")) + testCompile(project(":kotlin-stdlib")) testCompile(commonDep("junit:junit")) } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 8c962e14e3e..11c9e4f1b87 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -12,7 +12,7 @@ repositories { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib-jre8")) + compile(project(":kotlin-stdlib-jre8")) compileOnly(project(":kotlin-reflect-api")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -68,8 +68,8 @@ dependencies { testRuntime(commonDep("org.jetbrains", "markdown")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-preloader")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-preloader")) testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173 index 9a850371e01..a9b7fb3b2c9 100644 --- a/idea/build.gradle.kts.173 +++ b/idea/build.gradle.kts.173 @@ -12,7 +12,7 @@ repositories { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib-jre8")) + compile(project(":kotlin-stdlib-jre8")) compileOnly(project(":kotlin-reflect-api")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -68,8 +68,8 @@ dependencies { testRuntime(commonDep("org.jetbrains", "markdown")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-preloader")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-preloader")) testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31 index 1029b54e9ec..a24bce838f9 100644 --- a/idea/build.gradle.kts.as31 +++ b/idea/build.gradle.kts.as31 @@ -12,7 +12,7 @@ repositories { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib-jre8")) + compile(project(":kotlin-stdlib-jre8")) compileOnly(project(":kotlin-reflect-api")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -68,8 +68,8 @@ dependencies { testRuntime(commonDep("org.jetbrains", "markdown")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-preloader")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-preloader")) testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32 index 39ae7cdf60f..ee518842a9b 100644 --- a/idea/build.gradle.kts.as32 +++ b/idea/build.gradle.kts.as32 @@ -12,7 +12,7 @@ repositories { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib-jre8")) + compile(project(":kotlin-stdlib-jre8")) compileOnly(project(":kotlin-reflect-api")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -68,8 +68,8 @@ dependencies { testRuntime(commonDep("org.jetbrains", "markdown")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-preloader")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-preloader")) testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } diff --git a/idea/build.gradle.kts.as33 b/idea/build.gradle.kts.as33 index a7bfa058636..f76ba8edd1c 100644 --- a/idea/build.gradle.kts.as33 +++ b/idea/build.gradle.kts.as33 @@ -12,7 +12,7 @@ repositories { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib-jre8")) + compile(project(":kotlin-stdlib-jre8")) compileOnly(project(":kotlin-reflect-api")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -68,8 +68,8 @@ dependencies { testRuntime(commonDep("org.jetbrains", "markdown")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-preloader")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-preloader")) testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index dd3bbb9d4f9..5fd33dd6498 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) @@ -44,7 +44,7 @@ dependencies { testCompile(intellijPluginDep("properties")) testCompileOnly(intellijPluginDep("android")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/idea/idea-android/build.gradle.kts.173 b/idea/idea-android/build.gradle.kts.173 index a5971ecc3d7..8db6ddd6587 100644 --- a/idea/idea-android/build.gradle.kts.173 +++ b/idea/idea-android/build.gradle.kts.173 @@ -26,7 +26,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) @@ -44,7 +44,7 @@ dependencies { testCompile(intellijPluginDep("properties")) testCompileOnly(intellijPluginDep("android")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/idea/idea-android/build.gradle.kts.as31 b/idea/idea-android/build.gradle.kts.as31 index dafc72f76c2..769ebde2451 100644 --- a/idea/idea-android/build.gradle.kts.as31 +++ b/idea/idea-android/build.gradle.kts.as31 @@ -26,7 +26,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) @@ -44,7 +44,7 @@ dependencies { testCompile(intellijPluginDep("properties")) testCompileOnly(intellijPluginDep("android")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/idea/idea-android/build.gradle.kts.as32 b/idea/idea-android/build.gradle.kts.as32 index dafc72f76c2..769ebde2451 100644 --- a/idea/idea-android/build.gradle.kts.as32 +++ b/idea/idea-android/build.gradle.kts.as32 @@ -26,7 +26,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) @@ -44,7 +44,7 @@ dependencies { testCompile(intellijPluginDep("properties")) testCompileOnly(intellijPluginDep("android")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/idea/idea-android/build.gradle.kts.as33 b/idea/idea-android/build.gradle.kts.as33 index ea7f7674ce8..dbf5c526a20 100644 --- a/idea/idea-android/build.gradle.kts.as33 +++ b/idea/idea-android/build.gradle.kts.as33 @@ -26,7 +26,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) @@ -44,7 +44,7 @@ dependencies { testCompile(intellijPluginDep("properties")) testCompileOnly(intellijPluginDep("android")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 3602013187a..cc5f6664d89 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compileOnly(project(":kotlin-reflect-api")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 4ec774eaf6b..1eabaf34ee1 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:kapt3-idea")) diff --git a/idea/idea-gradle/build.gradle.kts.173 b/idea/idea-gradle/build.gradle.kts.173 index fe144b1b247..1ca5afa14b2 100644 --- a/idea/idea-gradle/build.gradle.kts.173 +++ b/idea/idea-gradle/build.gradle.kts.173 @@ -34,7 +34,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:kapt3-idea")) diff --git a/idea/idea-gradle/build.gradle.kts.as31 b/idea/idea-gradle/build.gradle.kts.as31 index 86cec50f8f6..dbf27511683 100644 --- a/idea/idea-gradle/build.gradle.kts.as31 +++ b/idea/idea-gradle/build.gradle.kts.as31 @@ -34,7 +34,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:kapt3-idea")) diff --git a/idea/idea-gradle/build.gradle.kts.as32 b/idea/idea-gradle/build.gradle.kts.as32 index 86cec50f8f6..dbf27511683 100644 --- a/idea/idea-gradle/build.gradle.kts.as32 +++ b/idea/idea-gradle/build.gradle.kts.as32 @@ -34,7 +34,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:kapt3-idea")) diff --git a/idea/idea-gradle/build.gradle.kts.as33 b/idea/idea-gradle/build.gradle.kts.as33 index 86cec50f8f6..dbf27511683 100644 --- a/idea/idea-gradle/build.gradle.kts.as33 +++ b/idea/idea-gradle/build.gradle.kts.as33 @@ -34,7 +34,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:kapt3-idea")) diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts index 53360d58fe0..141db705077 100644 --- a/idea/idea-jps-common/build.gradle.kts +++ b/idea/idea-jps-common/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compileOnly(project(":kotlin-reflect-api")) compile(project(":compiler:util")) compile(project(":compiler:cli-common")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index bf6a49b3e41..3102a8f3160 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) diff --git a/idea/idea-maven/build.gradle.kts.173 b/idea/idea-maven/build.gradle.kts.173 index 42dc5f76bff..39331142c17 100644 --- a/idea/idea-maven/build.gradle.kts.173 +++ b/idea/idea-maven/build.gradle.kts.173 @@ -32,7 +32,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) diff --git a/idea/idea-maven/build.gradle.kts.as31 b/idea/idea-maven/build.gradle.kts.as31 index a89bd48b85e..7d78a259b88 100644 --- a/idea/idea-maven/build.gradle.kts.as31 +++ b/idea/idea-maven/build.gradle.kts.as31 @@ -32,7 +32,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) diff --git a/idea/idea-maven/build.gradle.kts.as32 b/idea/idea-maven/build.gradle.kts.as32 index a89bd48b85e..7d78a259b88 100644 --- a/idea/idea-maven/build.gradle.kts.as32 +++ b/idea/idea-maven/build.gradle.kts.as32 @@ -32,7 +32,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) diff --git a/idea/idea-maven/build.gradle.kts.as33 b/idea/idea-maven/build.gradle.kts.as33 index 32da0a65381..4ecbe3f70dc 100644 --- a/idea/idea-maven/build.gradle.kts.as33 +++ b/idea/idea-maven/build.gradle.kts.as33 @@ -32,7 +32,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts index 392e6e932f1..9ccb34f80a6 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts +++ b/idea/kotlin-gradle-tooling/build.gradle.kts @@ -9,7 +9,7 @@ plugins { jvmTarget = "1.6" dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:cli-common")) compile(intellijPluginDep("gradle")) } diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 62ae7eea69d..65a5678642d 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) @@ -17,7 +17,7 @@ dependencies { testCompile(project(":idea")) testCompile(projectTests(":idea:idea-test-framework")) testCompile(project(":compiler:light-classes")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } testCompile(project(":idea:idea-native")) { isTransitive = false } diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index 19b7f9a33c3..ed6e9311bc2 100644 --- a/j2k/build.gradle.kts.173 +++ b/j2k/build.gradle.kts.173 @@ -7,7 +7,7 @@ plugins { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) @@ -17,7 +17,7 @@ dependencies { testCompile(project(":idea")) testCompile(projectTests(":idea:idea-test-framework")) testCompile(project(":compiler:light-classes")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index a87062e92e9..93f49d37b57 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -7,7 +7,7 @@ plugins { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) @@ -17,7 +17,7 @@ dependencies { testCompile(project(":idea")) testCompile(projectTests(":idea:idea-test-framework")) testCompile(project(":compiler:light-classes")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index 72a06b30dab..0c92233ea7c 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -7,7 +7,7 @@ plugins { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) @@ -17,7 +17,7 @@ dependencies { testCompile(project(":idea")) testCompile(projectTests(":idea:idea-test-framework")) testCompile(project(":compiler:light-classes")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) { includeJars("idea") } testCompile(project(":idea:idea-native")) { isTransitive = false } diff --git a/j2k/build.gradle.kts.as33 b/j2k/build.gradle.kts.as33 index 49f86d32dba..a5cad3636f3 100644 --- a/j2k/build.gradle.kts.as33 +++ b/j2k/build.gradle.kts.as33 @@ -7,7 +7,7 @@ plugins { dependencies { testRuntime(intellijDep()) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) @@ -17,7 +17,7 @@ dependencies { testCompile(project(":idea")) testCompile(projectTests(":idea:idea-test-framework")) testCompile(project(":compiler:light-classes")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } testCompile(project(":idea:idea-native")) { isTransitive = false } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index dc9cb5f05e7..2654e7caeda 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } @@ -34,8 +34,8 @@ dependencies { testRuntime(project(it)) } testRuntime(intellijDep()) - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-script-runtime")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-script-runtime")) } sourceSets { diff --git a/jps-plugin/build.gradle.kts.173 b/jps-plugin/build.gradle.kts.173 index 334e963c60f..ac16e33fd46 100644 --- a/jps-plugin/build.gradle.kts.173 +++ b/jps-plugin/build.gradle.kts.173 @@ -24,7 +24,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } @@ -34,8 +34,8 @@ dependencies { testRuntime(project(it)) } testRuntime(intellijDep()) - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-script-runtime")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-script-runtime")) } sourceSets { diff --git a/jps-plugin/build.gradle.kts.as31 b/jps-plugin/build.gradle.kts.as31 index 825ced1cb2d..83d759b136e 100644 --- a/jps-plugin/build.gradle.kts.as31 +++ b/jps-plugin/build.gradle.kts.as31 @@ -24,7 +24,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } @@ -33,8 +33,8 @@ dependencies { testRuntime(project(it)) } testRuntime(intellijDep()) - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-script-runtime")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-script-runtime")) } sourceSets { diff --git a/jps-plugin/build.gradle.kts.as32 b/jps-plugin/build.gradle.kts.as32 index 905e952bbbc..38faa941b7a 100644 --- a/jps-plugin/build.gradle.kts.as32 +++ b/jps-plugin/build.gradle.kts.as32 @@ -24,7 +24,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } @@ -33,8 +33,8 @@ dependencies { testRuntime(project(it)) } testRuntime(intellijDep()) - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-script-runtime")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-script-runtime")) } sourceSets { diff --git a/jps-plugin/build.gradle.kts.as33 b/jps-plugin/build.gradle.kts.as33 index 314de763987..80d8526dd9b 100644 --- a/jps-plugin/build.gradle.kts.as33 +++ b/jps-plugin/build.gradle.kts.as33 @@ -24,7 +24,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } @@ -33,7 +33,7 @@ dependencies { testRuntime(project(it)) } testRuntime(intellijDep()) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } sourceSets { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 407110129d3..9a76fa00eab 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -33,11 +33,11 @@ dependencies { testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":generators:test-generator")) - testRuntime(projectDist(":kotlin-stdlib")) - testJsRuntime(projectDist(":kotlin-stdlib-js")) - testJsRuntime(projectDist(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned - testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests + testRuntime(project(":kotlin-stdlib")) + testJsRuntime(project(":kotlin-stdlib-js")) + testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":kotlin-preloader")) // it's required for ant tests testRuntime(project(":compiler:backend-common")) testRuntime(commonDep("org.fusesource.jansi", "jansi")) diff --git a/libraries/examples/annotation-processor-example/build.gradle.kts b/libraries/examples/annotation-processor-example/build.gradle.kts index b6f10bea64f..46e677ed129 100644 --- a/libraries/examples/annotation-processor-example/build.gradle.kts +++ b/libraries/examples/annotation-processor-example/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) } sourceSets { diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts index 33f49373efa..01998cdbde0 100644 --- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts @@ -17,9 +17,9 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-junit")) testRuntime(project(":kotlin-reflect")) compilerClasspath(projectRuntimeJar(":kotlin-compiler-embeddable")) - compilerClasspath(projectDist(":kotlin-reflect")) - compilerClasspath(projectDist(":kotlin-stdlib")) - compilerClasspath(projectDist(":kotlin-script-runtime")) + compilerClasspath(project(":kotlin-reflect")) + compilerClasspath(project(":kotlin-stdlib")) + compilerClasspath(project(":kotlin-script-runtime")) } projectTest { diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts index 0964549b476..f1d3ebf3af7 100644 --- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts @@ -6,13 +6,13 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compile(projectRuntimeJar(":kotlin-compiler-embeddable")) compile(project(":kotlin-script-util")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } projectTest() diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index e84242fcc44..554d089f630 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } testCompileOnly(project(":kotlin-reflect-api")) - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } noDefaultJar() diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 172eb95d6d5..dd797ef8b31 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -46,7 +46,7 @@ configurations.getByName("compileOnly").extendsFrom(shadows) val mainJar by configurations.creating dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) proguardDeps(project(":kotlin-stdlib")) proguardDeps(project(":kotlin-annotations-jvm")) diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index 04aeb886a51..24960c0a32f 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val packedJars by configurations.creating dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) packedJars(project(":kotlin-annotation-processing")) { isTransitive = false } runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) } diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index bd216de5e51..bea95139db0 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:daemon-common")) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts.173 b/libraries/tools/kotlin-script-util/build.gradle.kts.173 index d299b523f36..e1593ee5cb5 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts.173 +++ b/libraries/tools/kotlin-script-util/build.gradle.kts.173 @@ -7,7 +7,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:daemon-common")) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts.as32 b/libraries/tools/kotlin-script-util/build.gradle.kts.as32 index bd216de5e51..bea95139db0 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts.as32 +++ b/libraries/tools/kotlin-script-util/build.gradle.kts.as32 @@ -7,7 +7,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:daemon-common")) diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index fe89d623368..8cd44656042 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compileOnly(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - runtime(projectDist(":kotlin-stdlib")) + runtime(project(":kotlin-stdlib")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index a929246a8fc..31463b7155e 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { testCompile(project(":compiler:cli")) testCompile(project(":kotlin-android-extensions-runtime")) testCompile(projectTests(":compiler:tests-common")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testRuntime(intellijPluginDep("junit")) { includeJars("idea-junit", "resources_en") } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 6ff419c7466..eb50bd7eb75 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -30,13 +30,13 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) testCompile(intellijDep()) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 index 5feab020f6f..2fc3a8e4a39 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 @@ -30,13 +30,13 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) testCompile(intellijDep()) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 index 3dedbdc1737..f68293fb8d4 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 @@ -30,13 +30,13 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) testCompile(intellijDep()) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 index 3dedbdc1737..f68293fb8d4 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 @@ -30,13 +30,13 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) testCompile(intellijDep()) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 index d20a0a59507..b7554a785c2 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 @@ -30,13 +30,13 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-android")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) testCompile(intellijDep()) diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts index 6fe29444320..e0b39966d51 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 index bf616c36fee..64978cda1c8 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 @@ -16,7 +16,7 @@ dependencies { testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 index 34fcb2520ec..0944e3bc1cc 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 @@ -16,7 +16,7 @@ dependencies { testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 index 1ed717dfd58..4b9c83c3df1 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 @@ -16,7 +16,7 @@ dependencies { testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts index 945c5ed7fba..2b11d4a3ccb 100644 --- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts @@ -8,7 +8,7 @@ plugins { jvmTarget = "1.6" dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compileOnly(commonDep("com.google.android", "android")) } diff --git a/plugins/kapt3/kapt3-base/build.gradle.kts b/plugins/kapt3/kapt3-base/build.gradle.kts index 3a27266e19f..987d5ce1d27 100644 --- a/plugins/kapt3/kapt3-base/build.gradle.kts +++ b/plugins/kapt3/kapt3-base/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) testCompile(commonDep("junit:junit")) } diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 44ac02d931d..dc82ca63c13 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -7,7 +7,7 @@ plugins { jvmTarget = "1.6" dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":idea")) { isTransitive = false } compile(project(":idea:kotlin-gradle-tooling")) diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts index a233a93fd37..bf82aea8bb3 100644 --- a/plugins/kapt3/kapt3-runtime/build.gradle.kts +++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) } jvmTarget = "1.6" diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 9bc0a2cc0be..0a69e57cb4f 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compile(project(":js:js.frontend")) compile(project(":js:js.translator")) - runtime(projectDist(":kotlin-stdlib")) + runtime(project(":kotlin-stdlib")) } sourceSets { diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index e34392f7a00..8da18f1caa8 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compileOnly(project(":compiler:plugin-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all") } - runtime(projectDist(":kotlin-stdlib")) + runtime(project(":kotlin-stdlib")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) testCompile(project(":compiler:backend")) diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index 174e4d4acd5..b0c766caa25 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi", "log4j", "jdom", "jps-model") } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) } sourceSets { diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts index dc1538f8dd5..aa85e2d3a11 100644 --- a/plugins/uast-kotlin-idea/build.gradle.kts +++ b/plugins/uast-kotlin-idea/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:util.runtime")) compile(project(":compiler:backend")) compile(project(":compiler:frontend.java")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 76ff6d5c9f9..2d3cab25048 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:util.runtime")) compile(project(":compiler:backend")) compile(project(":compiler:frontend")) @@ -16,7 +16,7 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("java-api", "java-impl", "asm-all") } - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(project(":compiler:util")) @@ -28,7 +28,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-android")) testRuntime(project(":idea:idea-gradle")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } diff --git a/plugins/uast-kotlin/build.gradle.kts.173 b/plugins/uast-kotlin/build.gradle.kts.173 index e215739743d..6001323238f 100644 --- a/plugins/uast-kotlin/build.gradle.kts.173 +++ b/plugins/uast-kotlin/build.gradle.kts.173 @@ -5,7 +5,7 @@ plugins { } dependencies { - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:util.runtime")) compile(project(":compiler:backend")) compile(project(":compiler:frontend")) @@ -14,7 +14,7 @@ dependencies { compile(project(":idea:idea-core")) compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions", "asm-all") } - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(project(":compiler:util")) @@ -26,7 +26,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-android")) testRuntime(project(":idea:idea-gradle")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index 9c7d96c0f97..ab4082643d8 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -21,11 +21,11 @@ dependencies { testCompile(project(":compiler:daemon-common")) testCompile(projectRuntimeJar(":kotlin-daemon-client")) testCompile(commonDep("junit:junit")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) - testCompile(projectDist(":kotlin-test:kotlin-test-junit")) - testRuntimeCompilerJar(projectDist(":kotlin-compiler")) - testStdlibJar(projectDist(":kotlin-stdlib")) - testScriptRuntimeJar(projectDist(":kotlin-script-runtime")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-junit")) + testRuntimeCompilerJar(project(":kotlin-compiler")) + testStdlibJar(project(":kotlin-stdlib")) + testScriptRuntimeJar(project(":kotlin-script-runtime")) } sourceSets { diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index f40fb596519..127602c1111 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -63,9 +63,9 @@ val sideJars by configurations.creating dependencies { packedJars(protobufFull()) packedJars(project(":core:builtins", configuration = "builtins")) - sideJars(projectDist(":kotlin-script-runtime")) - sideJars(projectDist(":kotlin-stdlib")) - sideJars(projectDist(":kotlin-reflect")) + sideJars(project(":kotlin-script-runtime")) + sideJars(project(":kotlin-stdlib")) + sideJars(project(":kotlin-reflect")) sideJars(project(":kotlin-compiler-client-embeddable")) sideJars(commonDep("io.javaslang", "javaslang")) sideJars(commonDep("javax.inject")) diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 6f2d765eaee..e43f40bf328 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { } compileOnly(project(":kotlin-reflect-api")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:descriptors")) { isTransitive = false } compile(project(":compiler:psi")) { isTransitive = false } compile(project(":core:descriptors.jvm")) { isTransitive = false } @@ -59,7 +59,7 @@ dependencies { compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) } - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false } @@ -78,7 +78,7 @@ dependencies { } testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-script-runtime")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } diff --git a/ultimate/build.gradle.kts.173 b/ultimate/build.gradle.kts.173 index b72de2580c2..1a06809772f 100644 --- a/ultimate/build.gradle.kts.173 +++ b/ultimate/build.gradle.kts.173 @@ -22,7 +22,7 @@ dependencies { } compileOnly(project(":kotlin-reflect-api")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:descriptors")) { isTransitive = false } compile(project(":compiler:psi")) { isTransitive = false } compile(project(":core:descriptors.jvm")) { isTransitive = false } @@ -59,7 +59,7 @@ dependencies { compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) } - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false } @@ -78,7 +78,7 @@ dependencies { } testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-script-runtime")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } diff --git a/ultimate/build.gradle.kts.as31 b/ultimate/build.gradle.kts.as31 index e42960b4851..794f47efd0c 100644 --- a/ultimate/build.gradle.kts.as31 +++ b/ultimate/build.gradle.kts.as31 @@ -24,7 +24,7 @@ dependencies { } compileOnly(project(":kotlin-reflect-api")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:descriptors")) { isTransitive = false } compile(project(":compiler:psi")) { isTransitive = false } compile(project(":core:descriptors.jvm")) { isTransitive = false } @@ -61,7 +61,7 @@ dependencies { compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) } - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false } @@ -80,7 +80,7 @@ dependencies { } testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-script-runtime")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } diff --git a/ultimate/build.gradle.kts.as32 b/ultimate/build.gradle.kts.as32 index fb17b06057f..dd92f05b335 100644 --- a/ultimate/build.gradle.kts.as32 +++ b/ultimate/build.gradle.kts.as32 @@ -24,7 +24,7 @@ dependencies { } compileOnly(project(":kotlin-reflect-api")) - compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-stdlib")) compile(project(":core:descriptors")) { isTransitive = false } compile(project(":compiler:psi")) { isTransitive = false } compile(project(":core:descriptors.jvm")) { isTransitive = false } @@ -61,7 +61,7 @@ dependencies { compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) } - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false } @@ -80,7 +80,7 @@ dependencies { } testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-script-runtime")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }