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
plugins/allopen/allopen-ide/build.gradle.kts
+3 -5
View File
@@ -44,11 +44,9 @@ dependencies {
testCompileOnly(intellijDep())
testRuntimeOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java"))
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("java"))
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
sourceSets {
plugins/fir/fir-plugin-prototype/build.gradle.kts
+2 -4
View File
@@ -27,10 +27,8 @@ dependencies {
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":core:descriptors.runtime"))
Platform[192].orHigher {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
plugins/kapt3/kapt3-compiler/build.gradle.kts
+1 -3
View File
@@ -16,9 +16,7 @@ dependencies {
testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
Platform[192].orHigher {
testRuntime(intellijPluginDep("java"))
}
testRuntime(intellijPluginDep("java"))
compile(project(":compiler:util"))
compile(project(":compiler:cli"))
plugins/kapt3/kapt3-idea/build.gradle.kts
+1 -3
View File
@@ -13,9 +13,7 @@ dependencies {
compileOnly(project(":idea:idea-core"))
compileOnly(project(":idea:idea-gradle"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("java"))
compileOnly(intellijPluginDep("gradle"))
compileOnly(intellijPluginDep("android"))
}
plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+1 -4
View File
@@ -25,10 +25,7 @@ dependencies {
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:1.0-M1-1.4.0-rc") { isTransitive = false }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
sourceSets {
plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts
+1 -3
View File
@@ -15,9 +15,7 @@ dependencies {
compile(project(":idea:idea-maven"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("java"))
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
compileOnly(intellijPluginDep("gradle"))
plugins/noarg/noarg-ide/build.gradle.kts
+3 -5
View File
@@ -44,12 +44,10 @@ dependencies {
testCompileOnly(intellijDep())
testRuntimeOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java"))
compileOnly(intellijPluginDep("java"))
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
sourceSets {
plugins/parcelize/parcelize-ide/build.gradle.kts
+2 -6
View File
@@ -23,9 +23,7 @@ dependencies {
compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
}
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testCompile(projectTests(":idea"))
testCompile(projectTests(":plugins:parcelize:parcelize-compiler"))
@@ -39,9 +37,7 @@ dependencies {
testRuntime(toolsJar())
Platform[192].orHigher {
testRuntimeOnly(intellijPluginDep("java"))
}
testRuntimeOnly(intellijPluginDep("java"))
}
sourceSets {
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+1 -4
View File
@@ -21,10 +21,7 @@ dependencies {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
sourceSets {
plugins/uast-kotlin-idea/build.gradle.kts
+1 -3
View File
@@ -13,9 +13,7 @@ dependencies {
compile(project(":idea:idea-core"))
compile(project(":plugins:uast-kotlin"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("java"))
}
sourceSets {
plugins/uast-kotlin/build.gradle.kts
+4 -6
View File
@@ -21,12 +21,10 @@ dependencies {
compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
}
if (Platform.P192.orHigher()) {
compileOnly(intellijDep()) { includeJars("platform-impl") }
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testRuntime(intellijPluginDep("java"))
}
compileOnly(intellijDep()) { includeJars("platform-impl") }
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testRuntime(intellijPluginDep("java"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":compiler:tests-common"))