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
compiler/fir/fir2ir/build.gradle.kts
+4
View File
@@ -32,6 +32,10 @@ dependencies {
testCompileOnly(project(":kotlin-reflect-api"))
testRuntime(project(":kotlin-reflect"))
Platform[192].orHigher {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
}
sourceSets {
compiler/fir/modularized-tests/build.gradle.kts
+9 -1
View File
@@ -10,7 +10,15 @@ plugins {
dependencies {
testCompileOnly(intellijDep()) {
includeJars("openapi", "java-api", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject)
includeJars("openapi", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject)
}
Platform[191].orLower {
testCompileOnly(intellijDep()) { includeJars("java-api") }
}
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
}
testRuntime(intellijDep())
compiler/fir/psi2fir/build.gradle.kts
+5
View File
@@ -25,6 +25,11 @@ dependencies {
testCompileOnly(project(":kotlin-reflect-api"))
testRuntime(project(":kotlin-reflect"))
Platform[192].orHigher {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
}
sourceSets {
compiler/fir/resolve/build.gradle.kts
+9 -1
View File
@@ -12,7 +12,15 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testCompileOnly(intellijDep()) { includeJars("openapi", "java-api", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
Platform[191].orLower {
testCompileOnly(intellijDep()) { includeJars("java-api") }
}
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
}
testRuntime(intellijDep())