Cleanup 193 compatibility fixes

2020-11-06 02:53:05 +03:00
parent 8620d26a8a
commit 3feff16a77
118 changed files with 305 additions and 715 deletions
@@ -92,13 +92,8 @@ dependencies {
        isTransitive = false
    }

-    Platform[192].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
-    }
-
-    Platform[193].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
-    }
+    testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
+    testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
 }

 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
@@ -1,109 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    testCompile(project(":kotlin-scripting-compiler"))
-    testCompile(project(":core:descriptors"))
-    testCompile(project(":core:descriptors.jvm"))
-    testCompile(project(":core:deserialization"))
-    testCompile(project(":compiler:util"))
-    testCompile(project(":compiler:tests-mutes"))
-    testCompile(project(":compiler:backend"))
-    testCompile(project(":compiler:ir.tree.impl"))
-    testCompile(project(":compiler:fir:tree"))
-    testCompile(project(":compiler:fir:raw-fir:psi2fir"))
-    testCompile(project(":compiler:fir:raw-fir:light-tree2fir"))
-    testCompile(project(":compiler:fir:fir2ir"))
-    testCompile(project(":compiler:fir:jvm"))
-    testCompile(project(":compiler:fir:fir2ir:jvm-backend"))
-    testCompile(project(":compiler:fir:fir-serialization"))
-    testCompile(project(":compiler:fir:fir-deserialization"))
-    testCompile(project(":compiler:fir:cones"))
-    testCompile(project(":compiler:fir:resolve"))
-    testCompile(project(":compiler:fir:checkers"))
-    testCompile(project(":compiler:fir:java"))
-    testCompile(project(":compiler:fir:entrypoint"))
-    testCompile(project(":compiler:ir.ir2cfg"))
-    testCompile(project(":compiler:frontend"))
-    testCompile(project(":compiler:frontend.java"))
-    testCompile(project(":compiler:util"))
-    testCompile(project(":compiler:cli-common"))
-    testCompile(project(":compiler:cli"))
-    testCompile(project(":compiler:cli-js"))
-    testCompile(project(":compiler:light-classes"))
-    testCompile(project(":compiler:serialization"))
-    testCompile(project(":kotlin-preloader"))
-    testCompile(project(":compiler:cli-common"))
-    testCompile(project(":daemon-common"))
-    testCompile(project(":daemon-common-new"))
-    testCompile(project(":js:js.serializer"))
-    testCompile(project(":js:js.frontend"))
-    testCompile(project(":js:js.translator"))
-    testCompile(project(":native:frontend.native"))
-    testCompileOnly(project(":plugins:android-extensions-compiler"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":compiler:tests-common-jvm6"))
-    testCompile(project(":kotlin-scripting-compiler-impl"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(androidDxJar()) { isTransitive = false }
-    testCompile(commonDep("com.android.tools:r8"))
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompileOnly(toolsJar())
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    Platform[193].orLower {
-        testCompile(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) }
-    }
-    Platform[201].orHigher {
-        testCompile(intellijDep()) {
-            includeJars(
-                "testFramework",
-                "testFramework.core",
-                rootProject = rootProject
-            )
-        }
-    }
-    testCompile(intellijDep()) {
-        includeJars(
-            "jps-model",
-            "extensions",
-            "util",
-            "platform-api",
-            "platform-impl",
-            "idea",
-            "idea_rt",
-            "guava",
-            "trove4j",
-            "asm-all",
-            "log4j",
-            "jdom",
-            "streamex",
-            "bootstrap",
-            rootProject = rootProject
-        )
-        isTransitive = false
-    }
-
-    Platform[192].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
-    }
-
-    Platform[193].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
-    }
-    if (Platform.P202.orHigher()) {
-        testCompile(intellijDep()) {
-            includeJars("intellij-deps-fastutil-8.3.1-1")
-            isTransitive = false
-        }
-    }
-}
-
-sourceSets {
-    "main" { }
-    "test" { projectDefault() }
-}
-
-testsJar {}