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

Fix kotlin compiler tests in 192 (KT-32193)

Browse Source 
#KT-32193 Fixed
This commit is contained in:
Nikolay Krasko
2019-07-22 18:43:45 +03:00
parent 3729c4e770
commit 58f294a757
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build.gradle.kts
+4
View File
@@ -66,6 +66,10 @@ dependencies {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
Platform[192].orHigher {
testRuntimeOnly(intellijPluginDep("java"))
}
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":kotlin-daemon-client-new"))
testRuntime(project(":kotlin-daemon")) // +
compiler/fir/resolve/build.gradle.kts
+2 -8
View File
@@ -13,14 +13,8 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
Platform[191].orLower {
testCompileOnly(intellijDep()) { includeJars("java-api") }
}
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
}
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijDep())
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -64,7 +64,7 @@ dependencies {
}
Platform[192].orHigher {
testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-objectSerializer") }
testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
}
}
compiler/tests-java8/build.gradle.kts
+3
View File
@@ -12,6 +12,9 @@ dependencies {
testCompile(projectTests(":generators:test-generator"))
testRuntime(project(":kotlin-reflect"))
testRuntime(intellijDep())
Platform[192].orHigher {
testRuntimeOnly(intellijPluginDep("java"))
}
}
sourceSets {
compiler/tests-spec/build.gradle.kts
+4
View File
@@ -5,6 +5,10 @@ plugins {
dependencies {
testCompile(projectTests(":compiler"))
Platform[192].orHigher {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijPluginDep("java"))
}
}
sourceSets {
libraries/tools/kotlinp/build.gradle.kts
+4
View File
@@ -29,6 +29,10 @@ dependencies {
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") }
}
shadows(project(":kotlinx-metadata-jvm", configuration = "runtime"))
shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
}