Fix tests after projects rearrangement

This commit is contained in:
Ilya Chernikov
2017-09-01 11:03:39 +03:00
parent 0676ebd530
commit aa34c7d32a
4 changed files with 7 additions and 9 deletions
+1 -1
View File
@@ -279,7 +279,7 @@ tasks {
":kotlin-annotation-processing:test",
":kotlin-source-sections-compiler-plugin:test",
":plugins:uast-kotlin:test",
":kotlin-annotation-processing")
":kotlin-annotation-processing-gradle:test")
}
"scripting-tests" {
+1
View File
@@ -19,6 +19,7 @@ dependencies {
compile(projectTests(":compiler"))
compile(projectTests(":compiler:tests-java8"))
compile(projectTests(":compiler:container"))
compile(projectTests(":compiler:incremental-compilation-impl"))
compile(projectTests(":idea"))
compile(projectTests(":j2k"))
compile(projectTests(":idea:idea-android"))
@@ -18,18 +18,13 @@ val packedJars by configurations.creating
dependencies {
compileOnly(project(":kotlin-annotation-processing"))
compileOnly("org.jetbrains.kotlin:gradle-api:1.6")
compileOnly("com.android.tools.build:gradle:1.1.0")
compile("org.jetbrains.kotlin:gradle-api:1.6")
compile("com.android.tools.build:gradle:1.1.0")
compile(projectDist(":kotlin-stdlib"))
testCompile(commonDep("junit:junit"))
packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
projectTest {
workingDir = projectDir
}
@@ -24,7 +24,9 @@ sourceSets {
"test" { projectDefault() }
}
projectTest()
projectTest {
workingDir = rootDir
}
runtimeJar()
sourcesJar()