Fix tests in the new build infrastructure

This commit is contained in:
Ilya Chernikov
2017-08-24 17:11:23 +03:00
parent a61facf3d1
commit d039d191f2
48 changed files with 383 additions and 228 deletions
@@ -3,7 +3,7 @@ description = "Simple Annotation Processor for testing kapt"
apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
}
sourceSets {
@@ -14,7 +14,7 @@ dependencies {
compile project(':kotlin-test::kotlin-test-junit')
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly project(path: ":kotlin-stdlib", configuration: "distJar")
compileOnly project(':compiler')
compileOnly project(':compiler:plugin-api')
compileOnly project(':compiler:cli-common')
@@ -4,13 +4,14 @@ description = "Sample Kotlin JSR 223 scripting jar with daemon (out-of-process)
apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compile(projectDist(":kotlin-stdlib"))
compile(projectDist(":kotlin-script-runtime"))
compile(projectRuntimeJar(":kotlin-compiler"))
compile(project(":kotlin-script-util"))
compile(projectRuntimeJar(":kotlin-daemon-client"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
testRuntime(project(":kotlin-reflect"))
testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
testRuntime(projectDist(":kotlin-reflect"))
}
projectTest()
@@ -4,12 +4,13 @@ description = "Sample Kotlin JSR 223 scripting jar with local (in-process) compi
apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compile(projectDist(":kotlin-stdlib"))
compile(projectDist(":kotlin-script-runtime"))
compile(projectRuntimeJar(":kotlin-compiler"))
compile(project(":kotlin-script-util"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
testRuntime(project(":kotlin-reflect"))
testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
testCompile(commonDep("junit:junit"))
testRuntime(projectDist(":kotlin-reflect"))
}
projectTest()