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

Fix tests in the new build infrastructure

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
plugins/allopen/allopen-cli/build.gradle.kts
+3 -6
View File
@@ -7,8 +7,8 @@ dependencies {
compileOnly(ideaSdkCoreDeps("intellij-core"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:frontend"))
runtime(project(":kotlin-compiler", configuration = "runtimeJar"))
runtime(project(":kotlin-stdlib"))
runtime(projectDist(":kotlin-compiler"))
runtime(projectDist(":kotlin-stdlib"))
}
sourceSets {
@@ -20,10 +20,7 @@ val jar = runtimeJar {
from(fileTree("$projectDir/src")) { include("META-INF/**") }
}
dist {
from(jar)
rename("^kotlin-", "")
}
dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")
ideaPlugin {
from(jar)
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+2 -1
View File
@@ -17,7 +17,8 @@ dependencies {
testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
testCompile(projectTests(":idea"))
testCompile(projectTests(":idea:idea-android"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(commonDep("junit:junit"))
testRuntime(project(":plugins:android-extensions-jps"))
testRuntime(project(":plugins:sam-with-receiver-ide"))
testRuntime(project(":plugins:noarg-ide"))
plugins/noarg/noarg-cli/build.gradle.kts
+3 -6
View File
@@ -9,8 +9,8 @@ dependencies {
compileOnly(project(":compiler:backend"))
compileOnly(project(":compiler:util"))
compileOnly(project(":compiler:plugin-api"))
runtime(project(":kotlin-compiler", configuration = "runtimeJar"))
runtime(project(":kotlin-stdlib"))
runtime(projectDist(":kotlin-compiler"))
runtime(projectDist(":kotlin-stdlib"))
}
sourceSets {
@@ -22,10 +22,7 @@ val jar = runtimeJar {
from(fileTree("$projectDir/src")) { include("META-INF/**") }
}
dist {
from(jar)
rename("^kotlin-", "")
}
dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")
ideaPlugin {
from(jar)
plugins/plugins-tests/build.gradle.kts
+3 -6
View File
@@ -18,8 +18,9 @@ dependencies {
testCompile(project(":idea:idea-android")) { isTransitive = false }
testCompile(project(":plugins:lint")) { isTransitive = false }
testCompile(project(":plugins:uast-kotlin"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":jps-plugin"))
testCompile(commonDep("junit:junit"))
testCompileOnly(ideaSdkDeps("jps-builders"))
testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
testCompile(ideaPluginDeps("*.jar", plugin = "android", subdir = "lib/jps"))
@@ -37,12 +38,8 @@ sourceSets {
testsJar {}
val test: Test by tasks
test.apply {
projectTest {
dependsOnTaskIfExistsRec("dist", project = rootProject)
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+3 -6
View File
@@ -7,8 +7,8 @@ dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:plugin-api"))
runtime(project(":kotlin-compiler", configuration = "runtimeJar"))
runtime(project(":kotlin-stdlib"))
runtime(projectDist(":kotlin-compiler"))
runtime(projectDist(":kotlin-stdlib"))
}
sourceSets {
@@ -24,10 +24,7 @@ javadocJar()
publish()
dist {
from(jar)
rename("^kotlin-", "")
}
dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")
ideaPlugin {
from(jar)
plugins/uast-kotlin-idea/build.gradle.kts
+1 -1
View File
@@ -2,7 +2,7 @@
apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
compile(project(":compiler:backend"))
compile(project(":compiler:frontend.java"))
plugins/uast-kotlin/build.gradle.kts
+2 -2
View File
@@ -2,14 +2,14 @@
apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
compile(project(":compiler:backend"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:light-classes"))
compileOnly(ideaSdkDeps("openapi", "idea"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":compiler.tests-common"))
testCompile(commonDep("junit:junit"))
testCompile(project(":compiler:util"))