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

Fix tests after rebasing and messing with the dependencies

Browse Source
This commit is contained in:
Ilya Chernikov
2017-12-21 11:41:03 +01:00
committed by Vyacheslav Gerasimov
parent 246f73c879
commit 6f1e6f1f1b
14 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build.gradle.kts
+2 -1
View File
@@ -40,6 +40,8 @@ val testJvm6ServerRuntime by configurations.creating
val antLauncherJar by configurations.creating
dependencies {
testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
depDistProjects.forEach {
testCompile(projectDist(it))
}
@@ -62,7 +64,6 @@ dependencies {
testRuntime(projectDist(":kotlin-daemon-client"))
testRuntime(androidDxJar())
testRuntime(files(toolsJar()))
testRuntime(intellijDep())
testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
compiler/tests-java8/build.gradle.kts
+1 -1
View File
@@ -4,7 +4,7 @@ apply { plugin("kotlin") }
dependencies {
testCompile(projectTests(":compiler:tests-common"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(projectTests(":generators:test-generator"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(intellijDep())
idea/build.gradle.kts
+3 -2
View File
@@ -3,6 +3,8 @@ import org.gradle.jvm.tasks.Jar
apply { plugin("kotlin") }
dependencies {
testRuntime(intellijDep())
compile(project(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
@@ -72,7 +74,7 @@ dependencies {
(rootProject.extra["compilerModules"] as Array<String>).forEach {
testCompile(project(it))
}
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijPluginDep("IntelliLang"))
testCompile(intellijPluginDep("copyright"))
testCompile(intellijPluginDep("properties"))
@@ -83,7 +85,6 @@ dependencies {
testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") }
testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") }
testRuntime(intellijDep())
testRuntime(intellijPluginDep("junit"))
testRuntime(intellijPluginDep("gradle"))
testRuntime(intellijPluginDep("Groovy"))
idea/idea-android/build.gradle.kts
+1
View File
@@ -45,6 +45,7 @@ dependencies {
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijDep())
testRuntime(intellijPluginDep("android"))
testRuntime(intellijPluginDep("copyright"))
idea/idea-gradle/build.gradle.kts
+1 -1
View File
@@ -3,6 +3,7 @@ apply { plugin("kotlin") }
val androidSdk by configurations.creating
dependencies {
testRuntime(intellijDep())
compileOnly(project(":idea"))
compileOnly(project(":idea:idea-jvm"))
@@ -35,7 +36,6 @@ dependencies {
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(intellijDep())
// TODO: the order of the plugins matters here, consider avoiding order-dependency
testRuntime(intellijPluginDep("junit"))
testRuntime(intellijPluginDep("testng")) { includeJars("jcommander", "resources_en") }
idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
+2 -1
View File
@@ -32,7 +32,8 @@ import java.io.File
class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() {
fun testNoErrors() {
val root = myFixture.copyDirectoryToProject("../libraries/stdlib/src", "")
val relativePathToProjectRoot = File(System.getProperty("user.dir")).relativeTo(File(myFixture.testDataPath)).path
val root = myFixture.copyDirectoryToProject("$relativePathToProjectRoot/libraries/stdlib/src", "")
val psiManager = psiManager // workaround for KT-3974 IllegalAccessError when accessing protected method inherited by outer class
j2k/build.gradle.kts
+2 -1
View File
@@ -18,6 +18,8 @@ val usedIntellijPlugins = arrayOf(
"java-decompiler")
dependencies {
testRuntime(intellijDep())
compile(projectDist(":kotlin-stdlib"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
@@ -38,7 +40,6 @@ dependencies {
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(intellijDep())
usedIntellijPlugins.forEach {
testRuntime(intellijPluginDep(it))
}
js/js.tests/build.gradle.kts
+3 -2
View File
@@ -15,12 +15,14 @@ apply { plugin("kotlin") }
val antLauncherJar by configurations.creating
dependencies {
testRuntime(intellijDep())
testCompile(protobufFull())
testCompile(projectTests(":compiler:tests-common"))
testCompileOnly(project(":compiler:frontend"))
testCompileOnly(project(":compiler:cli"))
testCompileOnly(project(":compiler:util"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
testCompile(project(":js:js.translator"))
testCompile(project(":js:js.serializer"))
@@ -36,7 +38,6 @@ dependencies {
testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common"))
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
testRuntime(intellijDep())
antLauncherJar(commonDep("org.apache.ant", "ant"))
antLauncherJar(files(toolsJar()))
plugins/allopen/allopen-cli/build.gradle.kts
+3 -3
View File
@@ -4,6 +4,8 @@ description = "Kotlin AllOpen Compiler Plugin"
apply { plugin("kotlin") }
dependencies {
testRuntime(intellijDep())
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
@@ -16,8 +18,6 @@ dependencies {
testCompile(project(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testRuntime(intellijDep())
}
sourceSets {
@@ -40,4 +40,4 @@ ideaPlugin {
projectTest {
workingDir = rootDir
}
}
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+3 -1
View File
@@ -7,6 +7,8 @@ val robolectricClasspath by configurations.creating
val androidJar by configurations.creating
dependencies {
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
compile(project(":compiler:util"))
compile(project(":compiler:plugin-api"))
compile(project(":compiler:frontend"))
@@ -58,4 +60,4 @@ projectTest {
systemProperty("robolectric.classpath", robolectricClasspath.asPath)
systemProperty("android.jar", androidJar.singleFile.canonicalPath)
}
}
}
plugins/kapt3/kapt3-compiler/build.gradle.kts
+4 -2
View File
@@ -4,6 +4,10 @@ description = "Annotation Processor for Kotlin"
apply { plugin("kotlin") }
dependencies {
testRuntime(intellijDep())
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
compile(project(":compiler:util"))
compile(project(":compiler:cli"))
compile(project(":compiler:backend"))
@@ -17,8 +21,6 @@ dependencies {
testCompile(project(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
testCompile(project(":kotlin-annotation-processing-runtime"))
}
plugins/noarg/noarg-cli/build.gradle.kts
+3 -3
View File
@@ -4,6 +4,8 @@ description = "Kotlin NoArg Compiler Plugin"
apply { plugin("kotlin") }
dependencies {
testRuntime(intellijDep())
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:backend"))
@@ -19,8 +21,6 @@ dependencies {
testCompile(project(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testRuntime(intellijDep())
}
sourceSets {
@@ -43,4 +43,4 @@ ideaPlugin {
projectTest {
workingDir = rootDir
}
}
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+4 -2
View File
@@ -4,6 +4,9 @@ description = "Kotlin SamWithReceiver Compiler Plugin"
apply { plugin("kotlin") }
dependencies {
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijDep())
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:plugin-api"))
@@ -17,7 +20,6 @@ dependencies {
testCompile(project(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testRuntime(intellijDep())
}
sourceSets {
@@ -45,4 +47,4 @@ ideaPlugin {
projectTest {
workingDir = rootDir
}
}
ultimate/build.gradle.kts
+7 -4
View File
@@ -48,9 +48,9 @@ dependencies {
compileOnly(intellijPluginDep("NodeJS"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
testCompile(project(":plugins:lint")) { isTransitive = false }
testCompile(project(":idea:idea-jvm")) { isTransitive = false }
testCompileOnly(project(":idea:idea-test-framework")) { isTransitive = false }
testCompileOnly(project(":plugins:lint")) { isTransitive = false }
testCompileOnly(project(":idea:idea-jvm")) { isTransitive = false }
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":idea")) { isTransitive = false }
testCompile(projectTests(":generators:test-generator"))
@@ -77,7 +77,10 @@ dependencies {
testRuntime(project(":plugins:uast-kotlin"))
testRuntime(project(":plugins:uast-kotlin-idea"))
testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar"))
testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
testRuntime(project(":plugins:kapt3-idea"))
testRuntime(project(":idea:idea-test-framework"))
testRuntime(project(":plugins:lint"))
testRuntime(project(":idea:idea-jvm"))
springClasspath(commonDep("org.springframework", "spring-core"))
springClasspath(commonDep("org.springframework", "spring-beans"))