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

Cleanup 193 compatibility fixes

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2020-11-06 02:53:05 +03:00
parent 8620d26a8a
commit 3feff16a77
118 changed files with 305 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prepare/compiler/build.gradle.kts
+1 -9
View File
@@ -215,15 +215,7 @@ dependencies {
fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") }
}
if (Platform.P192.orHigher()) {
fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }
} else {
fatJarContents(intellijDep()) { includeJars("lz4-1.3.0") }
}
if (Platform.P183.orHigher() && Platform.P191.orLower()) {
fatJarContents(intellijCoreDep()) { includeJars("java-compatibility-1.0.1") }
}
fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }
fatJarContents(intellijDep()) {
includeIntellijCoreJarDependencies(project) {
prepare/idea-plugin/build.gradle.kts
+1 -8
View File
@@ -183,9 +183,7 @@ dependencies {
libraries(kotlinStdlib("jdk8"))
Platform[193].orHigher {
libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))
}
libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))
libraryProjects.forEach {
libraries(project(it)) { isTransitive = false }
@@ -199,13 +197,8 @@ dependencies {
gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false }
gradleToolingModel(project(":allopen-ide-plugin")) { isTransitive = false }
Platform[193].orLower {
gradleToolingModel(project(":idea:idea-gradle-tooling-api")) { isTransitive = false }
}
jpsPlugin(project(":kotlin-jps-plugin")) { isTransitive = false }
(libraries.dependencies + gradleToolingModel.dependencies)
.map { if (it is ProjectDependency) it.dependencyProject else it }
.forEach(::compile)