201: openapi.jar is removed

build-common/build.gradle.kts

@@ -23,8 +23,9 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(protobufFull())
     testCompile(kotlinStdlib())
-    testCompileOnly(intellijDep()) { includeJars("openapi") }
+    Platform[193].orLower {
-
+        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
     testRuntime(project(":kotlin-reflect"))
 }
 

compiler/android-tests/build.gradle.kts

@@ -13,7 +13,10 @@ dependencies {
     compile(project(":kotlin-reflect"))
     compile(projectTests(":compiler:tests-common"))
     compile(commonDep("junit:junit"))
-    compileOnly(intellijDep()) { includeJars("openapi") }
+
+    Platform[193].orLower {
+        compileOnly(intellijDep()) { includeJars("openapi") }
+    }
 
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(project(":core:descriptors"))
@@ -21,7 +24,11 @@ dependencies {
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
     testCompile(commonDep("junit:junit"))
-    testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) }
+    Platform[193].orLower {
+        testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
+
+    testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) }
     Platform[191].orLower {
         testCompile(intellijDep()) { includeJars("jps-builders") }
     }

compiler/build.gradle.kts

@@ -67,7 +67,10 @@ dependencies {
         testCompileOnly(project(it))
     }
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
+    Platform[193].orLower {
+        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
+    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
 
     Platform[192].orHigher {
         testRuntimeOnly(intellijPluginDep("java"))

compiler/fir/modularized-tests/build.gradle.kts

@@ -9,8 +9,12 @@ plugins {
 }
 
 dependencies {
+    Platform[193].orLower {
+        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
+
     testCompileOnly(intellijDep()) {
-        includeJars("openapi", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject)
+        includeJars("extensions", "idea_rt", "util", "asm-all", rootProject = rootProject)
     }
 
     Platform[191].orLower {

compiler/fir/resolve/build.gradle.kts

@@ -19,7 +19,10 @@ dependencies {
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
+    Platform[193].orLower {
+        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
+    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 

compiler/tests-common/build.gradle.kts

@@ -44,9 +44,11 @@ dependencies {
     testCompile(androidDxJar()) { isTransitive = false }
     testCompile(commonDep("com.android.tools:r8"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    Platform[193].orLower {
+        testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
     testCompile(intellijDep()) {
         includeJars(
-            "openapi",
             "jps-model",
             "extensions",
             "util",

jps-plugin/build.gradle.kts

@@ -18,8 +18,11 @@ dependencies {
     compile(project(":js:js.frontend"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
+    Platform[193].orLower {
+        compileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
     compileOnly(intellijDep()) {
-        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
+        includeJars("jdom", "trove4j", "jps-model", "platform-api", "util", "asm-all", rootProject = rootProject)
     }
     compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))

js/js.tests/build.gradle.kts

@@ -33,7 +33,10 @@ dependencies {
     testCompileOnly(project(":compiler:cli-js-klib"))
     testCompileOnly(project(":compiler:util"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
+    Platform[193].orLower {
+        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
+    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util") }
     testCompile(project(":compiler:backend.js"))
     testCompile(project(":compiler:backend.wasm"))
     testCompile(project(":kotlin-stdlib-js-ir"))

libraries/scripting/js-test/build.gradle.kts

@@ -18,8 +18,11 @@ dependencies {
     testCompile(project(":js:js.engines"))
     testCompile(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    Platform[193].orLower {
+        testRuntimeOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
     testRuntimeOnly(intellijDep()) {
-        includeJars("openapi", "idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject)
+        includeJars("idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject)
     }
     testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
 }

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -15,7 +15,10 @@ val embeddableTestRuntime by configurations.creating {
 dependencies {
     allTestsRuntime(commonDep("junit"))
     allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") }
-    allTestsRuntime(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "log4j", "jna") }
+    Platform[193].orLower {
+        allTestsRuntime(intellijDep()) { includeJars("openapi") }
+    }
+    allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
     testCompile(project(":kotlin-scripting-jvm-host"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(project(":kotlin-scripting-compiler"))

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -27,8 +27,14 @@ dependencies {
     testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     testRuntime("org.sonatype.aether:aether-api:1.13.1")
     testRuntime("org.apache.maven:maven-core:3.0.3")
-    compileOnly(intellijDep()) { includeJars("openapi", "util") }
+    Platform[193].orLower {
-    testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") }
+        compileOnly(intellijDep()) { includeJars("openapi") }
+    }
+    compileOnly(intellijDep()) { includeJars("util") }
+    Platform[193].orLower {
+        testCompile(intellijDep()) { includeJars("openapi") }
+    }
+    testCompile(intellijDep()) { includeJars("platform-api", "util") }
     testCompile(intellijCoreDep()) { includeJars("intellij-core") }
 
 }

plugins/kapt3/kapt3-compiler/build.gradle.kts

@@ -9,7 +9,10 @@ plugins {
 dependencies {
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
-    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
+    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt") }
+    Platform[193].orLower {
+        testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
+    }
 
     testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
 

plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts

@@ -18,7 +18,10 @@ dependencies {
     compileOnly(project(":idea"))
     compileOnly(project(":idea:idea-jvm"))
 
-    compileOnly(intellijDep()) { includeJars("platform-api", "openapi", "extensions", "util") }
+    Platform[193].orLower {
+        compileOnly(intellijDep()) { includeJars("openapi") }
+    }
+    compileOnly(intellijDep()) { includeJars("platform-api", "extensions", "util") }
     compileOnly(intellijDep("gradle"))
 }
 

plugins/source-sections/source-sections-compiler/build.gradle.kts

@@ -23,7 +23,10 @@ dependencies {
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi", "log4j", "jdom", "jps-model") }
+    Platform[193].orLower {
+        testCompileOnly(intellijDep()) { includeJars("openapi") }
+    }
+    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jdom", "jps-model") }
     testRuntime(project(":kotlin-reflect"))
 
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }