Fix kotlin compiler tests in 192 (KT-32193)
#KT-32193 Fixed
This commit is contained in:
@@ -66,6 +66,10 @@ dependencies {
|
|||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
|
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-reflect"))
|
||||||
testRuntime(project(":kotlin-daemon-client-new"))
|
testRuntime(project(":kotlin-daemon-client-new"))
|
||||||
testRuntime(project(":kotlin-daemon")) // +
|
testRuntime(project(":kotlin-daemon")) // +
|
||||||
|
|||||||
@@ -13,14 +13,8 @@ dependencies {
|
|||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||||
|
|
||||||
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
|
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
|
||||||
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
Platform[191].orLower {
|
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompileOnly(intellijDep()) { includeJars("java-api") }
|
|
||||||
}
|
|
||||||
|
|
||||||
Platform[192].orHigher {
|
|
||||||
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
|
|
||||||
}
|
|
||||||
|
|
||||||
testRuntime(intellijDep())
|
testRuntime(intellijDep())
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Platform[192].orHigher {
|
Platform[192].orHigher {
|
||||||
testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-objectSerializer") }
|
testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ dependencies {
|
|||||||
testCompile(projectTests(":generators:test-generator"))
|
testCompile(projectTests(":generators:test-generator"))
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntime(project(":kotlin-reflect"))
|
||||||
testRuntime(intellijDep())
|
testRuntime(intellijDep())
|
||||||
|
Platform[192].orHigher {
|
||||||
|
testRuntimeOnly(intellijPluginDep("java"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ plugins {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(projectTests(":compiler"))
|
testCompile(projectTests(":compiler"))
|
||||||
|
Platform[192].orHigher {
|
||||||
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
testRuntimeOnly(intellijPluginDep("java"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ dependencies {
|
|||||||
|
|
||||||
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|
||||||
|
Platform[192].orHigher {
|
||||||
|
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") }
|
||||||
|
}
|
||||||
|
|
||||||
shadows(project(":kotlinx-metadata-jvm", configuration = "runtime"))
|
shadows(project(":kotlinx-metadata-jvm", configuration = "runtime"))
|
||||||
shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
|
shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user