From f38123e78c07f2181f3e98fe8fa71748b712111a Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 30 Sep 2019 15:50:39 +0300 Subject: [PATCH] 193: Update to 193.3793.14-EAP-SNAPSHOT --- compiler/compiler.pro | 1 + gradle/versions.properties.193 | 5 +++-- idea/idea-gradle-native/build.gradle.kts | 9 ++++++++ idea/idea-gradle/build.gradle.kts | 9 ++++++++ .../quickfix/AbstractQuickFixMultiFileTest.kt | 4 ++-- .../kotlin-gradle-plugin/build.gradle.kts | 21 +++++++++++++++++-- .../testing/TCServiceMessagesClient.kt | 2 +- .../kotlin/nj2k/printing/JKSymbolRenderer.kt | 2 +- 8 files changed, 45 insertions(+), 8 deletions(-) diff --git a/compiler/compiler.pro b/compiler/compiler.pro index a31576ff126..ea6fd9779ac 100644 --- a/compiler/compiler.pro +++ b/compiler/compiler.pro @@ -65,6 +65,7 @@ messages/**) -dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl -dontwarn org.checkerframework.checker.nullness.qual.Nullable -dontwarn org.checkerframework.checker.nullness.qual.MonotonicNonNull +-dontwarn org.checkerframework.checker.nullness.qual.NonNull # Depends on apache batick which has lots of dependencies -dontwarn com.intellij.util.SVGLoader* diff --git a/gradle/versions.properties.193 b/gradle/versions.properties.193 index 8ddf09c8573..785428b1b4d 100644 --- a/gradle/versions.properties.193 +++ b/gradle/versions.properties.193 @@ -1,8 +1,8 @@ -versions.intellijSdk=193.2956.37-EAP-SNAPSHOT +versions.intellijSdk=193.3793.14-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.guava=27.1-jre versions.jar.groovy-all=2.4.17 versions.jar.lombok-ast=0.2.3 versions.jar.swingx-core=1.6.2-2 @@ -11,5 +11,6 @@ versions.jar.streamex=0.6.8 versions.jar.gson=2.8.5 versions.jar.oro=2.0.8 versions.jar.picocontainer=1.2 +versions.jar.teamcity-service-messages=2019.1.4-alpha ignore.jar.snappy-in-java=true versions.gradle-api=4.5.1 diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index eeeb8ba54f1..9977532d871 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -25,10 +25,16 @@ dependencies { testCompile(projectTests(":idea:idea-gradle")) compileOnly(intellijPluginDep("gradle")) + Platform[193].orHigher { + compileOnly(intellijPluginDep("gradle-java")) + } compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) testCompile(intellijPluginDep("gradle")) + Platform[193].orHigher { + testCompile(intellijPluginDep("gradle-java")) + } testCompileOnly(intellijPluginDep("Groovy")) testCompileOnly(intellijDep()) @@ -55,6 +61,9 @@ dependencies { testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) + Platform[193].orHigher { + testRuntime(intellijPluginDep("gradle-java")) + } testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) if (Ide.IJ()) { diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 99d508ab8d7..da36a506231 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -18,6 +18,9 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("gradle")) + Platform[193].orHigher { + compileOnly(intellijPluginDep("gradle-java")) + } compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijPluginDep("junit")) compileOnly(intellijPluginDep("testng")) @@ -32,6 +35,9 @@ dependencies { testCompile(projectTests(":idea:idea-test-framework")) testCompile(intellijPluginDep("gradle")) + Platform[193].orHigher { + testCompile(intellijPluginDep("gradle-java")) + } testCompileOnly(intellijPluginDep("Groovy")) testCompileOnly(intellijDep()) @@ -56,6 +62,9 @@ dependencies { testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) + Platform[193].orHigher { + testRuntime(intellijPluginDep("gradle-java")) + } testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) if (Ide.IJ()) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 86767831272..9f92763e00b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -65,8 +65,8 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest private fun enableInspectionTools(klass: Class<*>) { val eps = ContainerUtil.newArrayList() - ContainerUtil.addAll>(eps, *Extensions.getExtensions(LocalInspectionEP.LOCAL_INSPECTION)) - ContainerUtil.addAll>(eps, *Extensions.getExtensions(InspectionEP.GLOBAL_INSPECTION)) + ContainerUtil.addAll(eps, *Extensions.getExtensions(LocalInspectionEP.LOCAL_INSPECTION)) + ContainerUtil.addAll(eps, *Extensions.getExtensions(InspectionEP.GLOBAL_INSPECTION)) val tool = eps.firstOrNull { it.implementationClass == klass.name }?.instantiateTool() ?: error("Could not find inspection tool for class: $klass") diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 379d7e4ac08..035195e099e 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -65,15 +65,32 @@ dependencies { runtime(project(":kotlin-reflect")) jarContents(compileOnly(intellijDep()) { - includeJars("asm-all", "serviceMessages", "gson", rootProject = rootProject) + includeJars("asm-all", "gson", rootProject = rootProject) }) + jarContents(compileOnly(intellijDep()) { + if (Platform.P193.orHigher()) { + includeJars("teamcity-service-messages", rootProject = rootProject) + } else { + includeJars("serviceMessages", rootProject = rootProject) + } + }) + + // com.android.tools.build:gradle has ~50 unneeded transitive dependencies compileOnly("com.android.tools.build:gradle:3.0.0") { isTransitive = false } compileOnly("com.android.tools.build:gradle-core:3.0.0") { isTransitive = false } compileOnly("com.android.tools.build:builder-model:3.0.0") { isTransitive = false } - testCompile(intellijDep()) { includeJars("serviceMessages", "junit", rootProject = rootProject) } + testCompile(intellijDep()) { includeJars( "junit", rootProject = rootProject) } + testCompile(intellijDep()) { + if (Platform.P193.orHigher()) { + includeJars("teamcity-service-messages", rootProject = rootProject) + } else { + includeJars("serviceMessages", rootProject = rootProject) + } + } + testCompileOnly(project(":compiler")) testCompile(projectTests(":kotlin-build-common")) testCompile(project(":kotlin-android-extensions")) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt index b3f565f8dbe..b0ee68426b3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt @@ -508,7 +508,7 @@ internal open class TCServiceMessagesClient( if (currentLeaf is TestNode) { currentTest = currentLeaf output.append(currentLeaf.allOutput) - currentLeaf.failure(TestFailed(currentLeaf.cleanName, null)) + currentLeaf.failure(TestFailed(currentLeaf.cleanName, null as Throwable?)) } close(ts, currentLeaf.localId) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/printing/JKSymbolRenderer.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/printing/JKSymbolRenderer.kt index a098de4dccf..9f3bba6b80d 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/printing/JKSymbolRenderer.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/printing/JKSymbolRenderer.kt @@ -77,7 +77,7 @@ private class CanBeShortenedCache(project: Project) { } fun canBeShortened(symbol: JKClassSymbol): Boolean = canBeShortenedCache.getOrPut(symbol.name) { - !shortNameCache.processClassesWithName(symbol.name, Processor.FALSE, searchScope, null) + !shortNameCache.processClassesWithName(symbol.name, { false }, searchScope, null) } companion object {