Update to 192.5118.30

idea/build.gradle.kts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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>