diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 index 6e42c90d717..1a12369aa17 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.cli.jvm.compiler fun setupIdeaStandaloneExecution() { - System.getProperties().setProperty("idea.plugins.compatible.build", "201.6487") + System.getProperties().setProperty("idea.plugins.compatible.build", "201.6668.13") System.getProperties().setProperty("project.structure.add.tools.jar.to.new.jdk", "false") System.getProperties().setProperty("psi.track.invalidation", "true") System.getProperties().setProperty("psi.incremental.reparse.depth.limit", "1000") diff --git a/gradle/versions.properties.201 b/gradle/versions.properties.201 index 1b5c3b21a64..dfdd04bcf63 100644 --- a/gradle/versions.properties.201 +++ b/gradle/versions.properties.201 @@ -1,4 +1,4 @@ -versions.intellijSdk=201.6487-EAP-CANDIDATE-SNAPSHOT +versions.intellijSdk=201.6668.13-EAP-SNAPSHOT versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=193.6494.7 versions.jar.asm-all=7.0.1 diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 5930df548ee..5fa5ec538a3 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -95,11 +95,7 @@ dependencies { compileOnly(commonDep("org.jetbrains", "markdown")) compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - if (Platform[201].orHigher()) { - compileOnly(intellijPluginDep("platform-langInjection")) - } else { - compileOnly(intellijPluginDep("IntelliLang")) - } + compileOnly(intellijPluginDep("IntelliLang")) compileOnly(intellijPluginDep("copyright")) compileOnly(intellijPluginDep("properties")) compileOnly(intellijPluginDep("java-i18n")) @@ -149,7 +145,7 @@ dependencies { testRuntime(project(it)) } - testCompile(intellijPluginDep(if (Platform[201].orHigher()) "platform-langInjection" else "IntelliLang")) + testCompile(intellijPluginDep("IntelliLang")) testCompile(intellijPluginDep("copyright")) testCompile(intellijPluginDep("properties")) testCompile(intellijPluginDep("java-i18n")) diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index b97b48bad7a..3e493d71d3f 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -59,11 +59,7 @@ dependencies { testRuntime(intellijPluginDep("coverage")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) - if (Platform[201].orHigher()) { - testRuntime(intellijPluginDep("platform-langInjection")) - } else { - testRuntime(intellijPluginDep("IntelliLang")) - } + testRuntime(intellijPluginDep("IntelliLang")) testRuntime(intellijPluginDep("java-decompiler")) testRuntime(intellijPluginDep("java-i18n")) testRuntime(intellijPluginDep("junit")) diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index 11c04010c90..6b0eef2a320 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -22,11 +22,7 @@ dependencies { compileOnly(intellijPluginDep("testng")) compileOnly(intellijPluginDep("coverage")) compileOnly(intellijPluginDep("java-decompiler")) - if (Platform[201].orHigher()) { - compileOnly(intellijPluginDep("platform-langInjection")) - } else { - compileOnly(intellijPluginDep("IntelliLang")) - } + compileOnly(intellijPluginDep("IntelliLang")) compileOnly(intellijPluginDep("copyright")) compileOnly(intellijPluginDep("properties")) compileOnly(intellijPluginDep("java-i18n")) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 3b65adfb2ea..d4360d1e6a0 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -60,11 +60,7 @@ dependencies { testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) - if (Platform[201].orHigher()) { - testRuntime(intellijPluginDep("platform-langInjection")) - } else { - testRuntime(intellijPluginDep("IntelliLang")) - } + testRuntime(intellijPluginDep("IntelliLang")) testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("copyright")) testRuntime(intellijPluginDep("properties")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 32229303fa1..3ee330074cb 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -49,11 +49,7 @@ dependencies { testRuntime(project(":kotlinx-serialization-ide-plugin")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) - if (Platform[201].orHigher()) { - testRuntime(intellijPluginDep("platform-langInjection")) - } else { - testRuntime(intellijPluginDep("IntelliLang")) - } + testRuntime(intellijPluginDep("IntelliLang")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("java-i18n")) testRuntime(intellijPluginDep("gradle"))