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

Update to 192.5118.30

Browse Source
This commit is contained in:
Nikolay Krasko
2019-06-20 15:21:58 +03:00
parent 997d896557
commit beb1bc09d4
38 changed files with 197 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/build.gradle.kts
+4
View File
@@ -15,6 +15,10 @@ dependencies {
testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
}
Platform[192].orHigher {
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
}
compile(project(":compiler:util"))
compile(project(":compiler:cli"))
compile(project(":compiler:backend"))
plugins/kapt3/kapt3-idea/build.gradle.kts
+5
View File
@@ -12,6 +12,11 @@ dependencies {
compile(project(":idea:idea-core"))
compile(project(":idea:idea-gradle"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars("external-system-rt", "external-system-impl")
}
}
compileOnly(intellijPluginDep("gradle"))
compileOnly(intellijPluginDep("android"))
}
plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+4
View File
@@ -22,6 +22,10 @@ dependencies {
testCompile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0")
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
}
sourceSets {
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+4
View File
@@ -18,6 +18,10 @@ dependencies {
testCompile(commonDep("junit:junit"))
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
}
sourceSets {
plugins/source-sections/source-sections-compiler/build.gradle.kts
+4
View File
@@ -27,6 +27,10 @@ dependencies {
testRuntime(project(":kotlin-reflect"))
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
}
}
sourceSets {
plugins/uast-kotlin-idea/build.gradle.kts
+3
View File
@@ -13,6 +13,9 @@ dependencies {
compile(project(":idea:idea-core"))
compile(project(":plugins:uast-kotlin"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
}
sourceSets {
plugins/uast-kotlin/build.gradle.kts
+10 -5
View File
@@ -14,9 +14,18 @@ dependencies {
// BEWARE: Uast should not depend on IDEA.
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
if (Platform.P191.orLower()) {
compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
}
if (Platform.P192.orHigher()) {
compileOnly(intellijDep()) { includeJars("platform-impl") }
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testCompileOnly(intellijDep()) { includeJars("platform-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testRuntime(intellijPluginDep("java"))
}
testCompile(project(":kotlin-test:kotlin-test-jvm"))
@@ -27,10 +36,6 @@ dependencies {
testCompile(projectTests(":idea:idea-test-framework"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
if (Platform.P192.orHigher()) {
testCompileOnly(intellijDep()) { includeJars("platform-impl") }
}
testCompile(project(":idea:idea-native")) { isTransitive = false }
testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }