diff --git a/build.gradle.kts b/build.gradle.kts index b0301a4c104..9551395727f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -161,11 +161,7 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks extra["IntellijCoreDependencies"] = listOf( - when { - Platform[203].orHigher() -> "asm-all-9.0" - Platform[202].orHigher() -> "asm-all-8.0.1" - else -> "asm-all-7.0.1" - }, + "asm-all-9.0", "guava", "jdom", "jna", diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt index c3c5380d18d..ad0522278d7 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 { - P202, P203; + P203; val version: Int = name.drop(1).toInt() @@ -43,10 +43,7 @@ enum class Platform : CompatibilityPredicate { } enum class Ide(val platform: Platform) : CompatibilityPredicate { - IJ202(Platform.P202), - IJ203(Platform.P203), - - AS42(Platform.P202); + IJ203(Platform.P203); val kind = Kind.values().first { it.shortName == name.take(2) } val version = name.dropWhile { !it.isDigit() }.toInt() diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts index 9ad16ebb222..0b81eb42172 100644 --- a/compiler/fir/analysis-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/build.gradle.kts @@ -36,12 +36,7 @@ dependencies { includeJars("jna", rootProject = rootProject) } - Platform[202] { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } testRuntimeOnly(toolsJar()) } diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index 889cebc50ab..d616e553f46 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -43,12 +43,7 @@ dependencies { includeJars("jna", rootProject = rootProject) } - Platform[202] { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } val generationRoot = projectDir.resolve("tests-gen") diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index 9f80435f58d..71751c43f44 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -28,12 +28,7 @@ dependencies { includeJars("jna", rootProject = rootProject) } - Platform[202] { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } testRuntimeOnly(toolsJar()) } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 10adacd5170..65286d52c6a 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -57,12 +57,7 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(toolsJar()) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[202] { - testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } testCompile(intellijDep()) { includeJars( "guava", diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts index ccddc11b806..4249afb5b15 100644 --- a/compiler/visualizer/build.gradle.kts +++ b/compiler/visualizer/build.gradle.kts @@ -19,12 +19,7 @@ dependencies { testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) testImplementation(projectTests(":generators:test-generator")) - Platform[202] { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } testRuntimeOnly(compile(intellijDep()) { includeJars("jna", rootProject = rootProject) }) } diff --git a/gradle/javaInstrumentation.gradle.kts b/gradle/javaInstrumentation.gradle.kts index e37a94d9a5c..a651dcba389 100644 --- a/gradle/javaInstrumentation.gradle.kts +++ b/gradle/javaInstrumentation.gradle.kts @@ -20,18 +20,11 @@ fun Project.configureJavaInstrumentation() { if (plugins.hasPlugin("org.gradle.java")) { val javaInstrumentator by configurations.creating dependencies { - Platform[202] { - javaInstrumentator(intellijDep()) { - includeJars("javac2", "jdom", "asm-all", rootProject = rootProject) - } + javaInstrumentator(intellijDep()) { + includeJars("jdom", "asm-all", rootProject = rootProject) } - Platform[203].orHigher { - javaInstrumentator(intellijDep()) { - includeJars("jdom", "asm-all", rootProject = rootProject) - } - javaInstrumentator(intellijPluginDep("java")) { - includeJars("javac2", rootProject = rootProject) - } + javaInstrumentator(intellijPluginDep("java")) { + includeJars("javac2", rootProject = rootProject) } } for (sourceSet in listOf(mainSourceSet, testSourceSet)) { diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index f09a7e99778..6f8184955e0 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -20,12 +20,7 @@ dependencies { includeJars("idea", "idea_rt", "log4j", "guava", "jdom", rootProject = rootProject) } testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j")) - Platform[202] { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } sourceSets { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index ea477e4c525..4babd134d8d 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -207,12 +207,7 @@ dependencies { fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijDep()) { includeJars("jna-platform") } - Platform[202] { - fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } - Platform[203].orHigher { - fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - } + fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }