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/android-tests/build.gradle.kts
+7 -1
View File
@@ -23,7 +23,13 @@ dependencies {
testCompile(project(":compiler:frontend.java"))
testCompile(projectTests(":jps-plugin"))
testCompile(commonDep("junit:junit"))
testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", "jps-builders", rootProject = rootProject) }
testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) }
Platform[191].orLower {
testCompile(intellijDep()) { includeJars("jps-builders") }
}
Platform[192].orHigher {
testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
}
testCompile(jpsStandalone()) { includeJars("jps-model") }
testCompile(jpsBuildTest())
}
compiler/cli/cli-js/build.gradle.kts
+1 -1
View File
@@ -19,7 +19,7 @@ dependencies {
compile(project(":js:js.serializer"))
compile(project(":js:js.dce"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:cli"))
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())
compiler/light-classes/build.gradle.kts
+5
View File
@@ -10,6 +10,11 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
}
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
}
compiler/tests-common/build.gradle.kts
+4
View File
@@ -61,6 +61,10 @@ dependencies {
)
isTransitive = false
}
Platform[192].orHigher {
testCompile(intellijDep()) { includeJars("platform-util-ui") }
}
}
sourceSets {
core/descriptors.runtime/build.gradle.kts
+4
View File
@@ -13,6 +13,10 @@ dependencies {
testCompile(projectTests(":generators:test-generator"))
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[192].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
testRuntimeOnly(intellijPluginDep("jps-standalone")) { includeJars("jps-model") }
}
}
sourceSets {
gradle/versions.properties.192
+2 -2
View File
@@ -1,9 +1,9 @@
versions.intellijSdk=192.4205.45-EAP-SNAPSHOT
versions.intellijSdk=192.5118.30-EAP-SNAPSHOT
versions.androidBuildTools=r23.0.1
versions.idea.NodeJS=181.3494.12
versions.jar.asm-all=7.0.1
versions.jar.guava=25.1-jre
versions.jar.groovy-all=2.4.15
versions.jar.groovy-all=2.4.17
versions.jar.lombok-ast=0.2.3
versions.jar.swingx-core=1.6.2-2
versions.jar.kxml2=2.3.0
idea/build.gradle.kts
+7
View File
@@ -99,6 +99,13 @@ dependencies {
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijPluginDep("java"))
}
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
idea/fir-view/build.gradle.kts
+5
View File
@@ -21,6 +21,11 @@ dependencies {
compile(project(":idea:idea-core"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compileOnly(intellijPluginDep("gradle"))
}
idea/formatter/build.gradle.kts
+3
View File
@@ -8,6 +8,9 @@ dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
}
sourceSets {
idea/idea-core/build.gradle.kts
+10
View File
@@ -22,6 +22,16 @@ dependencies {
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars(
"java-api", "java-impl",
"external-system-rt", "external-system-impl"
)
}
}
compileOnly(intellijPluginDep("gradle"))
}
idea/idea-gradle-native/build.gradle.kts
+4
View File
@@ -32,6 +32,10 @@ dependencies {
testCompileOnly(intellijPluginDep("Groovy"))
testCompileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("external-system-rt", "external-system-impl") }
}
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":idea:idea-android"))
idea/idea-gradle/build.gradle.kts
+12
View File
@@ -22,6 +22,18 @@ dependencies {
compileOnly(intellijPluginDep("junit"))
compileOnly(intellijPluginDep("testng"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl")
}
testCompileOnly(intellijPluginDep("java")) {
includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl")
}
testRuntimeOnly(intellijPluginDep("java"))
}
testCompile(projectTests(":idea"))
testCompile(projectTests(":idea:idea-test-framework"))
idea/idea-j2k/build.gradle.kts
+4
View File
@@ -8,6 +8,10 @@ dependencies {
compile(project(":idea:idea-core"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
}
sourceSets {
idea/idea-jvm/build.gradle.kts
+6
View File
@@ -12,6 +12,12 @@ dependencies {
compileOnly(intellijDep())
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl")
}
}
compileOnly(intellijPluginDep("junit"))
compileOnly(intellijPluginDep("testng"))
compileOnly(intellijPluginDep("coverage"))
idea/idea-maven/build.gradle.kts
+6
View File
@@ -19,6 +19,12 @@ dependencies {
compile(project(":idea:idea-jps-common"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testRuntime(intellijPluginDep("java"))
}
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
testCompile(projectTests(":idea"))
idea/idea-native/build.gradle.kts
+3
View File
@@ -9,6 +9,9 @@ dependencies {
compile(project(":idea:idea-jvm"))
compile(project(":compiler:frontend"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compile(project(":kotlin-native:kotlin-native-library-reader"))
testCompileOnly(intellijDep())
idea/idea-test-framework/build.gradle.kts
+3
View File
@@ -15,6 +15,9 @@ dependencies {
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(commonDep("junit:junit"))
testCompileOnly(intellijDep())
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
}
}
sourceSets {
idea/jvm-debugger/jvm-debugger-core/build.gradle.kts
+5
View File
@@ -13,6 +13,11 @@ dependencies {
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compileOnly(intellijPluginDep("stream-debugger"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts
+3
View File
@@ -10,6 +10,9 @@ dependencies {
compile(project(":idea:idea-j2k"))
compile(project(":idea:jvm-debugger:jvm-debugger-util"))
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compileOnly(intellijDep())
idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts
+4
View File
@@ -9,6 +9,10 @@ dependencies {
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
compileOnly(intellijPluginDep("stream-debugger"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
idea/jvm-debugger/jvm-debugger-util/build.gradle.kts
+4
View File
@@ -12,6 +12,10 @@ dependencies {
compile(project(":idea:jvm-debugger:eval4j"))
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compileOnly(intellijDep())
idea/resources/META-INF/plugin.xml.192
+1 -1
View File
@@ -13,7 +13,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains</vendor>
<idea-version since-build="192.1" until-build="193.*"/>
<idea-version since-build="192.5118.30" until-build="193.*"/>
<depends>com.intellij.modules.platform</depends>
j2k/build.gradle.kts
+5
View File
@@ -24,6 +24,11 @@ dependencies {
testCompileOnly(intellijDep())
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testRuntimeOnly(intellijPluginDep("java"))
}
testCompile(project(":idea:idea-native")) { isTransitive = false }
testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }
jps-plugin/build.gradle.kts
+12 -2
View File
@@ -25,7 +25,17 @@ dependencies {
includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
}
}
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
Platform[191].orLower {
testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
}
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
testRuntimeOnly(intellijPluginDep("java"))
}
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(projectTests(":compiler:tests-common"))
@@ -33,7 +43,7 @@ dependencies {
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
Ide.IJ {
testCompile(intellijDep("devkit"))
}
nj2k/build.gradle.kts
+11 -1
View File
@@ -17,7 +17,17 @@ dependencies {
compile(project(":compiler:util"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("platform-api", "java-impl", "platform-impl", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("platform-api", "platform-impl", rootProject = rootProject) }
Platform[191].orLower {
compileOnly(intellijDep()) { includeJars("java-impl") }
}
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testRuntime(intellijPluginDep("java"))
}
testCompile(project(":idea"))
testCompile(projectTests(":j2k"))
nj2k/nj2k-services/build.gradle.kts
+4
View File
@@ -44,6 +44,10 @@ dependencies {
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
}
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
compileOnly(intellijPluginDep("copyright"))
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 }
prepare/compiler/build.gradle.kts
+1 -1
View File
@@ -77,7 +77,7 @@ dependencies {
fatJarContents(intellijDep()) { includeJars("lz4-1.3.0") }
}
if (Platform.P183.orHigher()) {
if (Platform.P183.orHigher() && Platform.P191.orLower()) {
fatJarContents(intellijCoreDep()) { includeJars("java-compatibility-1.0.1") }
}