azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove projectDist dependency helper usages

Browse Source 
Use default configuration dependencies instead of projectDist ones.

Original commit: a18770fbbb
This commit is contained in:
Ilya Gorbunov
2018-08-02 17:22:13 +03:00
parent 9cd0759e8d
commit 3522140643
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/build.gradle.kts
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
} }
dependencies { dependencies {
compile(projectDist(":kotlin-stdlib")) compile(project(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api")) compileOnly(project(":kotlin-reflect-api"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:cli-common")) compile(project(":compiler:cli-common"))
jps/jps-plugin/build.gradle.kts
+3 -3
View File
@@ -24,7 +24,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
@@ -34,8 +34,8 @@ dependencies {
testRuntime(project(it)) testRuntime(project(it))
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-script-runtime")) testRuntime(project(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
jps/jps-plugin/build.gradle.kts.173
+3 -3
View File
@@ -24,7 +24,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
@@ -34,8 +34,8 @@ dependencies {
testRuntime(project(it)) testRuntime(project(it))
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-script-runtime")) testRuntime(project(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
jps/jps-plugin/build.gradle.kts.as31
+3 -3
View File
@@ -24,7 +24,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
@@ -33,8 +33,8 @@ dependencies {
testRuntime(project(it)) testRuntime(project(it))
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-script-runtime")) testRuntime(project(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
jps/jps-plugin/build.gradle.kts.as32
+3 -3
View File
@@ -24,7 +24,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
@@ -33,8 +33,8 @@ dependencies {
testRuntime(project(it)) testRuntime(project(it))
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-script-runtime")) testRuntime(project(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
jps/jps-plugin/build.gradle.kts.as33
+2 -2
View File
@@ -24,7 +24,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
@@ -33,7 +33,7 @@ dependencies {
testRuntime(project(it)) testRuntime(project(it))
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
} }
sourceSets { sourceSets {