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

Pack jvm builtins into kotlin-stdlib shipped with idea plugin

Browse Source 
This lessens the possibility that kotlin plugin will get different
variants of builtins in the classpath, thus making builtins resources
loading less order-dependent.
This commit is contained in:
Ilya Gorbunov
2020-08-27 05:54:24 +03:00
committed by Dmitry Savvinov
parent f2cf64aec7
commit 0b5aedb0a2
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prepare/idea-plugin/build.gradle.kts
+13 -4
View File
@@ -172,13 +172,22 @@ dependencies {
embedded(protobufFull())
embedded(kotlinBuiltins(forJvm = true))
libraries(commonDep(kotlinxCollectionsImmutable()))
libraries(project(":kotlin-stdlib", "withJvmBuiltins"))
libraries(commonDep(kotlinxCollectionsImmutable())) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
libraries(commonDep("javax.inject"))
libraries(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8"))
libraries(commonDep("org.jetbrains", "markdown"))
libraries(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
libraries(commonDep("org.jetbrains", "markdown")) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
libraries(commonDep("io.javaslang", "javaslang"))
libraries(kotlinStdlib("jdk8"))
libraries(project(":kotlin-stdlib-jdk8")) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
Platform[193].orHigher {
libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))