From 32f811e0ecfb534fcb90ec87c1279caf5d1d7341 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 7 Jun 2021 20:14:33 +0300 Subject: [PATCH] Build: Cleanup old platforms from the build --- build-common/build.gradle.kts | 3 --- build.gradle.kts | 6 +----- .../src/main/kotlin/IdeCompatibilityDsl.kt | 10 +--------- buildSrc/src/main/kotlin/localDependencies.kt | 4 +--- buildSrc/src/main/kotlin/tasks.kt | 4 +--- compiler/android-tests/build.gradle.kts | 12 ++--------- .../fir/modularized-tests/build.gradle.kts | 4 ---- .../fir/tree/tree-generator/build.gradle.kts | 3 --- .../build.gradle.kts | 7 +------ compiler/tests-common/build.gradle.kts | 17 ++++++---------- gradle/jps.gradle.kts | 4 ++-- idea/build.gradle.kts | 10 ++-------- idea/idea-android/build.gradle.kts | 10 ++-------- .../build.gradle.kts | 8 +------- idea/idea-gradle-native/build.gradle.kts | 20 +++++-------------- idea/idea-gradle/build.gradle.kts | 17 ++++++---------- idea/idea-maven/build.gradle.kts | 20 +++++-------------- idea/idea-new-project-wizard/build.gradle.kts | 8 +++----- j2k/build.gradle.kts | 10 ++-------- jps-plugin/build.gradle.kts | 3 --- libraries/scripting/js-test/build.gradle.kts | 3 --- .../scripting/jvm-host-test/build.gradle.kts | 3 --- .../tools/kotlin-script-util/build.gradle.kts | 6 ------ .../android-extensions-idea/build.gradle.kts | 9 ++------- plugins/kapt3/kapt3-compiler/build.gradle.kts | 4 ---- .../parcelize/parcelize-ide/build.gradle.kts | 5 ----- .../sam-with-receiver-ide/build.gradle.kts | 3 --- plugins/uast-kotlin/build.gradle.kts | 4 ---- 28 files changed, 43 insertions(+), 174 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 0b340ebef79..e924be80bdc 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -23,9 +23,6 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(protobufFull()) testCompile(kotlinStdlib()) - Platform[193].orLower { - testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } - } testRuntime(project(":kotlin-reflect")) } diff --git a/build.gradle.kts b/build.gradle.kts index eeaf49af2d6..d664f7da97b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -201,15 +201,11 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks extra["IntellijCoreDependencies"] = listOf( - when { - Platform[202].orHigher() -> "asm-all-8.0.1" - else -> "asm-all-7.0.1" - }, + "asm-all-8.0.1", "guava", "jdom", "jna", "log4j", - if (Platform[201].orHigher()) null else "picocontainer", "snappy-in-java", "streamex", "trove4j" diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt index 9ce9b9bc4c7..c3c5380d18d 100644 --- a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt +++ b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt @@ -26,7 +26,7 @@ fun CompatibilityPredicate.or(other: CompatibilityPredicate): CompatibilityPredi } enum class Platform : CompatibilityPredicate { - P183, P191, P192, P193, P201, P202, P203; + P202, P203; val version: Int = name.drop(1).toInt() @@ -43,17 +43,9 @@ enum class Platform : CompatibilityPredicate { } enum class Ide(val platform: Platform) : CompatibilityPredicate { - IJ191(Platform.P191), - IJ192(Platform.P192), - IJ193(Platform.P193), - IJ201(Platform.P201), IJ202(Platform.P202), IJ203(Platform.P203), - AS35(Platform.P183), - AS36(Platform.P192), - AS40(Platform.P193), - AS41(Platform.P201), AS42(Platform.P202); val kind = Kind.values().first { it.shortName == name.take(2) } diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt index 58aaebd1f6a..bfa8299e472 100644 --- a/buildSrc/src/main/kotlin/localDependencies.kt +++ b/buildSrc/src/main/kotlin/localDependencies.kt @@ -181,9 +181,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File, "-Dplugin.path=${ideaPluginDir.absolutePath}" ) - if (Platform[201].orHigher()) { - jvmArgs("-Didea.platform.prefix=Idea") - } + jvmArgs("-Didea.platform.prefix=Idea") if (rootProject.findProperty("versions.androidStudioRelease") != null) { jvmArgs("-Didea.platform.prefix=AndroidStudio") diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 36d4bbda491..142c4a0c049 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -194,9 +194,7 @@ fun Project.projectTest( systemProperty("kotlin.ni", if (project.rootProject.hasProperty("newInferenceTests")) "true" else "false") systemProperty("org.jetbrains.kotlin.skip.muted.tests", if (project.rootProject.hasProperty("skipMutedTests")) "true" else "false") - if (Platform[202].orHigher()) { - systemProperty("idea.ignore.disabled.plugins", "true") - } + systemProperty("idea.ignore.disabled.plugins", "true") var subProjectTempRoot: Path? = null val projectName = project.name diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index e529a5ccdc2..8aff4680bf4 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -27,17 +27,9 @@ dependencies { testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - Platform[193].orLower { - testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) } - } - testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) } - Platform[202].orHigher { - testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) } - } - Platform[201].orLower { - testCompile(intellijDep()) { includeJars("groovy-all", rootProject = rootProject) } - } + testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) } + testCompile(intellijPluginDep("java")) { includeJars("jps-builders") } testCompile(jpsStandalone()) { includeJars("jps-model") } testCompile(jpsBuildTest()) diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts index 36b7a889317..e80febfa45d 100644 --- a/compiler/fir/modularized-tests/build.gradle.kts +++ b/compiler/fir/modularized-tests/build.gradle.kts @@ -15,10 +15,6 @@ repositories { } dependencies { - Platform[193].orLower { - testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } - } - testCompileOnly(intellijDep()) { includeJars("extensions", "idea_rt", "util", "asm-all", "platform-util-ex", "jna", rootProject = rootProject) } diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts index 629dbcf8758..6347d26edd2 100644 --- a/compiler/fir/tree/tree-generator/build.gradle.kts +++ b/compiler/fir/tree/tree-generator/build.gradle.kts @@ -17,9 +17,6 @@ dependencies { implementation(project(":compiler:fir:cones")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - Platform[193].orLower { - compileOnly(intellijDep()) { includeJars("picocontainer", rootProject = rootProject) } - } compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) } diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index b22008cb49c..6f2090e8a1a 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -26,12 +26,7 @@ dependencies { testCompile(intellijDep()) { includeJars("log4j", "jdom") } testRuntime(project(":kotlin-reflect")) testRuntime(project(":core:descriptors.runtime")) - - if (Platform.P192.orHigher()) { - testRuntime(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) } - } else { - testRuntime(intellijDep()) { includeJars("lz4-1.3.0") } - } + testRuntime(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) } } sourceSets { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index bd14fe79e9b..ded3512b1df 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -57,17 +57,12 @@ dependencies { 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( + "testFramework", + "testFramework.core", + rootProject = rootProject + ) } Platform[202] { testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index 3202411adc6..d08e3abf9c8 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -21,9 +21,9 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") { "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true", - if (Platform[201].orHigher()) "-Didea.platform.prefix=Idea" else null, + "-Didea.platform.prefix=Idea", "-Didea.is.unit.test=true", - if (Platform[202].orHigher()) "-Didea.ignore.disabled.plugins=true" else null, + "-Didea.ignore.disabled.plugins=true", "-Didea.home.path=$ideaSdkPath", "-Djps.kotlin.home=${ideaPluginDir.absolutePath}", "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false", diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index ea827a552f0..2ac64827c14 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -174,10 +174,7 @@ dependencies { if (Ide.IJ()) { testCompileOnly(intellijPluginDep("maven")) testRuntime(intellijPluginDep("maven")) - - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testRuntime(intellijPluginDep("repository-search")) } testRuntime(intellijPluginDep("junit")) @@ -192,14 +189,11 @@ dependencies { testRuntime(project(":idea:idea-fir")) } - if (Ide.AS36.orHigher()) { + if (Ide.AS()) { testRuntime(intellijPluginDep("android-layoutlib")) testRuntime(intellijPluginDep("git4idea")) testRuntime(intellijPluginDep("google-cloud-tools-core-as")) testRuntime(intellijPluginDep("google-login-as")) - } - - if (Ide.AS41.orHigher()) { testRuntime(intellijPluginDep("platform-images")) } } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 5c5195bdf25..e8fc76686f3 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -65,19 +65,13 @@ dependencies { Ide.IJ { testRuntime(intellijPluginDep("maven")) - - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testRuntime(intellijPluginDep("repository-search")) } testRuntime(intellijPluginDep("testng")) - if (Ide.AS36.orHigher()) { + Ide.AS { testRuntime(intellijPluginDep("android-layoutlib")) - } - - if (Ide.AS41.orHigher()) { testRuntime(intellijPluginDep("platform-images")) } } diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts b/idea/idea-android/idea-android-output-parser/build.gradle.kts index ad91162c588..c2e06528f03 100644 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts +++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts @@ -13,13 +13,7 @@ dependencies { } sourceSets { - if (Ide.IJ() && Platform[183].orLower()) { - "main" { - projectDefault() - } - } else { - "main" {} - } + "main" {} "test" {} } diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index f6a4cf06624..24c62c21b4b 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -28,9 +28,7 @@ dependencies { compileOnly(intellijDep()) testCompile(intellijPluginDep("gradle")) - Platform[193].orHigher { - testCompile(intellijPluginDep("gradle-java")) - } + testCompile(intellijPluginDep("gradle-java")) testCompileOnly(intellijPluginDep("Groovy")) testCompileOnly(intellijDep()) @@ -52,9 +50,7 @@ dependencies { testRuntime(project(":kotlinx-serialization-ide-plugin")) testRuntime(project(":plugins:lombok:lombok-ide-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency - Platform[192].orHigher { - testRuntime(intellijPluginDep("java")) - } + testRuntime(intellijPluginDep("java")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("properties")) @@ -64,19 +60,13 @@ dependencies { testRuntime(intellijPluginDep("coverage")) if (Ide.IJ()) { testRuntime(intellijPluginDep("maven")) - - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testRuntime(intellijPluginDep("repository-search")) } testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) - if (Ide.AS36.orHigher()) { + if (Ide.AS()) { testRuntime(intellijPluginDep("android-layoutlib")) - } - - if (Ide.AS41.orHigher()) { testRuntime(intellijPluginDep("platform-images")) } } @@ -95,7 +85,7 @@ projectTest(parallel = true) { configureFormInstrumentation() -if (Ide.AS41.orHigher()) { +if (Ide.AS()) { getOrCreateTask("test") { setExcludes(listOf("**")) } diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 4ae441a6f71..1328bdf15af 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -71,19 +71,14 @@ dependencies { testRuntime(intellijPluginDep("coverage")) if (Ide.IJ()) { testRuntime(intellijPluginDep("maven")) - - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testRuntime(intellijPluginDep("repository-search")) } + testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) - if (Ide.AS41.orHigher() || Ide.IJ202.orHigher()) { - testRuntime(intellijPluginDep("platform-images")) - } - - if (Ide.AS36.orHigher()) { + testRuntime(intellijPluginDep("platform-images")) + if (Ide.AS()) { testRuntime(intellijPluginDep("android-layoutlib")) } } @@ -101,7 +96,7 @@ testsJar() projectTest(parallel = false) { dependsOn(":dist") dependsOnKotlinGradlePluginInstall() - if (!Ide.AS41.orHigher()) { + if (Ide.IJ()) { systemProperty("android.studio.sdk.manager.disabled", "true") } workingDir = rootDir @@ -124,7 +119,7 @@ projectTest(parallel = false) { configureFormInstrumentation() -if (Ide.AS41.orHigher()) { +if (Ide.AS()) { getOrCreateTask("test") { setExcludes(listOf("**")) } diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 3cdc69e3cd8..f1a0062fd43 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -26,9 +26,7 @@ dependencies { excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) } excludeInAndroidStudio(rootProject) { - Platform[202].orHigher { - compileOnly(intellijPluginDep("maven-model")) - } + compileOnly(intellijPluginDep("maven-model")) } testCompile(projectTests(":idea")) @@ -40,14 +38,9 @@ dependencies { testCompileOnly(intellijPluginDep("maven")) testRuntime(intellijPluginDep("maven")) - Platform[202].orHigher { - testCompileOnly(intellijPluginDep("maven-model")) - testRuntime(intellijPluginDep("maven-model")) - } - - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testCompileOnly(intellijPluginDep("maven-model")) + testRuntime(intellijPluginDep("maven-model")) + testRuntime(intellijPluginDep("repository-search")) } testCompile(project(":idea:idea-native")) { isTransitive = false } @@ -78,11 +71,8 @@ dependencies { testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) - if (Ide.AS36.orHigher()) { + if (Ide.AS()) { testRuntime(intellijPluginDep("android-layoutlib")) - } - - if (Ide.AS41.orHigher()) { testRuntime(intellijPluginDep("platform-images")) } } diff --git a/idea/idea-new-project-wizard/build.gradle.kts b/idea/idea-new-project-wizard/build.gradle.kts index 042a033919e..c654180e7b4 100644 --- a/idea/idea-new-project-wizard/build.gradle.kts +++ b/idea/idea-new-project-wizard/build.gradle.kts @@ -47,11 +47,9 @@ dependencies { compileOnly(intellijPluginDep("maven")) } - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) } sourceSets { diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index f2cd6e247f4..2f671d29d46 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -50,10 +50,7 @@ dependencies { testRuntime(intellijPluginDep("coverage")) Ide.IJ { testRuntime(intellijPluginDep("maven")) - - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testRuntime(intellijPluginDep("repository-search")) } testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) @@ -67,11 +64,8 @@ dependencies { testRuntime(intellijPluginDep("java-decompiler")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - if (Ide.AS36.orHigher()) { + Ide.AS { testRuntime(intellijPluginDep("android-layoutlib")) - } - - if (Ide.AS41.orHigher()) { testRuntime(intellijPluginDep("platform-images")) } } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index de19db01850..cec2d47b854 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -18,9 +18,6 @@ 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", "platform-api", "util", "asm-all", rootProject = rootProject) } diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 39a0d966966..90d6c9611e1 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -16,9 +16,6 @@ dependencies { testCompile(project(":js:js.engines")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[193].orLower { - testRuntimeOnly(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) } - } testRuntimeOnly(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "guava", "jdom", rootProject = rootProject) } diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index 081a3011c02..823a6b3a46a 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -13,9 +13,6 @@ val embeddableTestRuntime by configurations.creating { dependencies { allTestsRuntime(commonDep("junit")) allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") } - Platform[193].orLower { - allTestsRuntime(intellijDep()) { includeJars("openapi") } - } allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") } testCompile(project(":kotlin-scripting-jvm-host-unshaded")) testCompile(projectTests(":compiler:tests-common")) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index a0b9c52858a..d30b039529a 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -27,13 +27,7 @@ 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") - Platform[193].orLower { - 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") } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index b1d8d4b6cc9..ff7966b3995 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -58,18 +58,13 @@ dependencies { testRuntime(intellijPluginDep("java-decompiler")) Ide.IJ { testRuntime(intellijPluginDep("maven")) - if (Ide.IJ201.orHigher()) { - testRuntime(intellijPluginDep("repository-search")) - } + testRuntime(intellijPluginDep("repository-search")) } testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) - if (Ide.AS36.orHigher()) { + Ide.AS { testRuntime(intellijPluginDep("android-layoutlib")) - } - - if (Ide.AS41.orHigher()) { testRuntime(intellijPluginDep("platform-images")) } } diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index 8af68b8103b..09f3ba2d28b 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -10,10 +10,6 @@ dependencies { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntime(intellijDep()) testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt") } - Platform[193].orLower { - testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } - } - testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } testRuntime(intellijPluginDep("java")) diff --git a/plugins/parcelize/parcelize-ide/build.gradle.kts b/plugins/parcelize/parcelize-ide/build.gradle.kts index 1d8da1b19f9..c3fdf8d80c2 100644 --- a/plugins/parcelize/parcelize-ide/build.gradle.kts +++ b/plugins/parcelize/parcelize-ide/build.gradle.kts @@ -18,11 +18,6 @@ dependencies { compile(intellijDep()) compile(intellijPluginDep("gradle")) - - Platform[191].orLower { - compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } - } - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } testCompile(projectTests(":idea")) diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts index 240d0eaf462..6cd082b1d2a 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts @@ -18,9 +18,6 @@ dependencies { compileOnly(project(":idea")) compileOnly(project(":idea:idea-jvm")) - Platform[193].orLower { - compileOnly(intellijDep()) { includeJars("openapi") } - } compileOnly(intellijDep()) { includeJars("platform-api", "extensions", "util") } compileOnly(intellijDep("gradle")) compileOnly(project(":idea:kotlin-gradle-tooling")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 674f364e807..067ee7e2323 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -29,10 +29,6 @@ dependencies { testCompileOnly(intellijDep()) - if (Platform.P191.orLower()) { - compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } - } - compileOnly(intellijDep()) { includeJars("platform-impl") } compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }