Remove projectDist dependency helper usages
Use default configuration dependencies instead of projectDist ones.
This commit is contained in:
@@ -6,7 +6,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(projectDist(":kotlin-stdlib"))
|
||||
compile(project(":kotlin-stdlib"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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"))
|
||||
|
||||
@@ -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"))
|
||||
}
|
||||
|
||||
@@ -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"))
|
||||
|
||||
@@ -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"))
|
||||
|
||||
@@ -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"))
|
||||
|
||||
Reference in New Issue
Block a user