From 35221406436eb67f905b047ad3b3de6d0183a707 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. Original commit: a18770fbbb62ed877ab3f40572e5d1bdb8f984cf --- jps/jps-common/build.gradle.kts | 2 +- jps/jps-plugin/build.gradle.kts | 6 +++--- jps/jps-plugin/build.gradle.kts.173 | 6 +++--- jps/jps-plugin/build.gradle.kts.as31 | 6 +++--- jps/jps-plugin/build.gradle.kts.as32 | 6 +++--- jps/jps-plugin/build.gradle.kts.as33 | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts index 53360d58fe0..141db705077 100644 --- a/jps/jps-common/build.gradle.kts +++ b/jps/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/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index dc9cb5f05e7..2654e7caeda 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/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/jps-plugin/build.gradle.kts.173 b/jps/jps-plugin/build.gradle.kts.173 index 334e963c60f..ac16e33fd46 100644 --- a/jps/jps-plugin/build.gradle.kts.173 +++ b/jps/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/jps-plugin/build.gradle.kts.as31 b/jps/jps-plugin/build.gradle.kts.as31 index 825ced1cb2d..83d759b136e 100644 --- a/jps/jps-plugin/build.gradle.kts.as31 +++ b/jps/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/jps-plugin/build.gradle.kts.as32 b/jps/jps-plugin/build.gradle.kts.as32 index 905e952bbbc..38faa941b7a 100644 --- a/jps/jps-plugin/build.gradle.kts.as32 +++ b/jps/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/jps-plugin/build.gradle.kts.as33 b/jps/jps-plugin/build.gradle.kts.as33 index 314de763987..80d8526dd9b 100644 --- a/jps/jps-plugin/build.gradle.kts.as33 +++ b/jps/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 {