Build: Use intellij maven repo instead of downloaded IDEA

#KTI-82

.idea/dictionaries/4u7.xml

@@ -5,13 +5,16 @@
       <w>cacheability</w>
       <w>cacheable</w>
       <w>cidr</w>
+      <w>fastutil</w>
       <w>foldable</w>
       <w>instrumentator</w>
       <w>jdks</w>
+      <w>proguarded</w>
       <w>protobuf</w>
       <w>redirector</w>
       <w>remapper</w>
       <w>sonatype</w>
+      <w>streamex</w>
       <w>unpresent</w>
     </words>
   </dictionary>

analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts

@@ -15,10 +15,11 @@ dependencies {
     implementation(project(":kotlin-reflect-api"))
 
     /*
-     We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCoreDep
+     We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCore
      the same as it is in `:fir:tree:tree-generator` module to the project be imported correctly
      */
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 
     implementation(project(":compiler:psi"))
 }

analysis/analysis-api-fir/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     api(project(":analysis:analysis-api"))
     api(project(":analysis:analysis-api-impl-base"))
     api(project(":compiler:light-classes"))
-    api(intellijCoreDep())
+    api(intellijCore())
     implementation(project(":analysis:analysis-api-providers"))
     implementation(project(":analysis:analysis-internal-utils"))
 
@@ -33,26 +33,6 @@ dependencies {
     testApi(toolsJar())
     testApiJUnit5()
     testApi(project(":analysis:symbol-light-classes"))
-
-    testRuntimeOnly(intellijDep()) {
-        includeJars(
-            "jps-model",
-            "extensions",
-            "util",
-            "platform-api",
-            "platform-impl",
-            "idea",
-            "guava",
-            "trove4j",
-            "asm-all",
-            "log4j",
-            "jdom",
-            "streamex",
-            "bootstrap",
-            "jna",
-            rootProject = rootProject
-        )
-    }
 }
 
 sourceSets {

analysis/analysis-api-impl-barebone/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     api(project(":compiler:psi"))
     api(project(":analysis:analysis-api-providers"))
     api(project(":analysis:project-structure"))
-    api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    api(intellijCore())
 
     testApiJUnit5()
     testApi(project(":kotlin-test:kotlin-test-junit"))

analysis/analysis-api-impl-base/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     api(project(":compiler:psi"))
     api(project(":analysis:analysis-api"))
     api(project(":analysis:analysis-api-impl-barebone"))
-    api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    api(intellijCore())
     implementation(project(":analysis:analysis-internal-utils"))
 
     testApiJUnit5()

analysis/analysis-api-providers/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     implementation(project(":compiler:frontend.java"))
     implementation(project(":core:compiler.common"))
     implementation(project(":analysis:project-structure"))
-    implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    implementation(intellijCore())
 }
 
 sourceSets {

analysis/analysis-api/build.gradle.kts

@@ -18,7 +18,8 @@ dependencies {
     implementation(project(":analysis:analysis-internal-utils"))
     implementation(project(":analysis:analysis-api-providers"))
 
-    api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    api(intellijCore())
+    api(commonDependency("com.google.guava:guava"))
 }
 
 kotlin {

analysis/analysis-internal-utils/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     implementation(project(":compiler:psi"))
-    implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    implementation(intellijCore())
 }
 
 sourceSets {

analysis/low-level-api-fir/build.gradle.kts

@@ -24,8 +24,7 @@ dependencies {
     implementation(project(":analysis:analysis-api-providers"))
     implementation(project(":analysis:analysis-internal-utils"))
 
-    api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
-
+    api(intellijCore())
 
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(projectTests(":compiler:test-infrastructure"))
@@ -42,21 +41,6 @@ dependencies {
     testImplementation(project(":analysis:symbol-light-classes"))
 
     testRuntimeOnly(project(":core:descriptors.runtime"))
-
-    testApi(intellijDep()) {
-        includeJars(
-            "jps-model",
-            "platform-api",
-            "platform-impl",
-            "guava",
-            "trove4j",
-            "asm-all",
-            "log4j",
-            "jdom",
-            "streamex",
-            rootProject = rootProject
-        )
-    }
 }
 
 sourceSets {

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/firTestUtils.kt

@@ -5,8 +5,6 @@
 
 package org.jetbrains.kotlin.analysis.low.level.api.fir
 
-import com.intellij.openapi.module.ModuleManager
-import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirRenderer
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
@@ -21,8 +19,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession
 import org.jetbrains.kotlin.analysis.project.structure.getKtModule
 import org.jetbrains.kotlin.psi.KtElement
 
-internal fun Project.allModules() = ModuleManager.getInstance(this).modules.toList()
-
 
 internal fun FirElement.renderWithClassName(renderMode: FirRenderer.RenderMode = FirRenderer.RenderMode.Normal): String =
     "${this::class.simpleName} `${render(renderMode)}`"

analysis/project-structure/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     implementation(project(":core:compiler.common"))
     implementation(project(":compiler:util"))
     implementation(project(":compiler:psi"))
-    implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    implementation(intellijCore())
 }
 
 kotlin {

analysis/symbol-light-classes/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation(project(":analysis:analysis-api"))
     implementation(project(":analysis:analysis-internal-utils"))
     implementation(project(":analysis:project-structure"))
-    implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    implementation(intellijCore())
 }
 
 sourceSets {

benchmarks/build.gradle.kts

@@ -13,10 +13,8 @@ dependencies {
     api(project(":compiler:frontend"))
     api(projectTests(":compiler:tests-common"))
     api(project(":compiler:cli"))
-    api(intellijCoreDep()) { includeJars("intellij-core") }
-    api(jpsStandalone()) { includeJars("jps-model") }
-    api(intellijPluginDep("java"))
-    api(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    api(intellijCore())
+    api(jpsModel())
     api("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version")
 }
 

build-common/build.gradle.kts

@@ -14,10 +14,12 @@ dependencies {
     compileOnly(project(":js:js.serializer"))
     compileOnly(project(":js:js.config"))
     compileOnly(project(":kotlin-util-klib-metadata"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) }
     compileOnly(project(":kotlin-reflect-api"))
 
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+
     testCompileOnly(project(":compiler:cli-common"))
     testApi(projectTests(":compiler:tests-common"))
     testApi(commonDependency("junit:junit"))

build.gradle.kts

@@ -154,22 +154,6 @@ extra["versions.kotlinx-metadata-jvm"] = "0.4.0"
 
 val useJvmFir by extra(project.kotlinBuildProperties.useFir)
 
-val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
-
-extra["intellijSeparateSdks"] = intellijSeparateSdks
-
-extra["IntellijCoreDependencies"] =
-    listOf(
-        "asm-all-9.0",
-        "guava",
-        "jdom",
-        "jna",
-        "log4j",
-        "snappy-in-java",
-        "streamex",
-        "trove4j"
-    ).filterNotNull()
-
 val irCompilerModules = arrayOf(
     ":compiler:ir.tree",
     ":compiler:ir.tree.impl",
@@ -421,7 +405,10 @@ allprojects {
     val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
 
     repositories {
+        if (kotlinBuildProperties.getOrNull("attachedIntellijVersion") != null) {
             kotlinBuildLocalRepo(project)
+        }
+
         mirrorRepo?.let(::maven)
 
         internalBootstrapRepo?.let(::maven)?.apply {
@@ -444,11 +431,13 @@ allprojects {
         }
 
         maven(intellijRepo)
+        maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
 
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
         maven("https://dl.google.com/dl/android/maven2")
-        maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
+
+        maven("https://download.jetbrains.com/teamcity-repository/")
 
         jcenter()
     }

buildSrc/src/main/kotlin/dependencies.kt

@@ -237,11 +237,8 @@ fun Project.testApiJUnit5(
             testApi("$component:$componentsVersion")
         }
 
-        addDependencyTo<ExternalModuleDependency>(this, "testImplementation", intellijDep()) {
         // This dependency is needed only for FileComparisonFailure
-            includeJars("idea_rt", rootProject = rootProject)
-            isTransitive = false
-        }
+        add("testImplementation", intellijJavaRt())
 
         // This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes
         add("testRuntimeOnly", commonDependency("junit:junit"))

buildSrc/src/main/kotlin/intellijDependencies.kt

@@ -0,0 +1,34 @@
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.project
+
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+val Project.intellijVersion
+    get() = rootProject.extra["versions.intellijSdk"]
+
+fun Project.intellijCore() = dependencies.project(":dependencies:intellij-core")
+
+fun Project.jpsModel() = "com.jetbrains.intellij.platform:jps-model:$intellijVersion"
+fun Project.jpsModelSerialization() = "com.jetbrains.intellij.platform:jps-model-serialization:$intellijVersion"
+fun Project.jpsModelImpl() = "com.jetbrains.intellij.platform:jps-model-impl:$intellijVersion"
+fun Project.jpsBuildTest() = "com.jetbrains.intellij.idea:jps-build-test:$intellijVersion"
+fun Project.intellijPlatformUtil() = "com.jetbrains.intellij.platform:util:$intellijVersion"
+fun Project.intellijJavaRt() = "com.jetbrains.intellij.java:java-rt:$intellijVersion"
+fun Project.intellijAnalysis() = "com.jetbrains.intellij.platform:analysis:$intellijVersion"
+
+/**
+ * Runtime version of annotations that are already in Kotlin stdlib (historically Kotlin has older version of this one).
+ *
+ * SHOULD NOT BE USED IN COMPILE CLASSPATH!
+ *
+ * `@NonNull`, `@Nullabe` from `idea/annotations.jar` has `TYPE` target which leads to different types treatment in Kotlin compiler.
+ * On the other hand, `idea/annotations.jar` contains org/jetbrains/annotations/Async annations which is required for IDEA debugger.
+ *
+ * So, we are excluding `annotaions.jar` from all other `kotlin.build` and using this one for runtime only
+ * to avoid accidentally including `annotations.jar` by calling `intellijDep()`.
+ */
+fun Project.intellijRuntimeAnnotations() = "org.jetbrains:annotations:${rootProject.extra["versions.annotations"]}"

buildSrc/src/main/kotlin/localDependencies.kt

@@ -80,33 +80,16 @@ fun Project.intellijDep(module: String? = null, forIde: Boolean = false) =
 
 fun Project.intellijCoreDep() = "kotlin.build:intellij-core:${rootProject.extra["versions.intellijSdk"]}"
 
-fun Project.jpsStandalone() = "kotlin.build:jps-standalone:${rootProject.extra["versions.intellijSdk"]}"
-
-fun Project.jpsBuildTest() = "com.jetbrains.intellij.idea:jps-build-test:${rootProject.extra["versions.intellijSdk"]}"
-
-/**
- * Runtime version of annotations that are already in Kotlin stdlib (historically Kotlin has older version of this one).
- *
- * SHOULD NOT BE USED IN COMPILE CLASSPATH!
- *
- * `@NonNull`, `@Nullabe` from `idea/annotations.jar` has `TYPE` target which leads to different types treatment in Kotlin compiler.
- * On the other hand, `idea/annotations.jar` contains org/jetbrains/annotations/Async annations which is required for IDEA debugger.
- *
- * So, we are excluding `annotaions.jar` from all other `kotlin.build` and using this one for runtime only
- * to avoid accidentally including `annotations.jar` by calling `intellijDep()`.
- */
-fun Project.intellijRuntimeAnnotations() = "org.jetbrains:annotations:${rootProject.extra["versions.annotations"]}"
-
 fun Project.intellijPluginDep(plugin: String, forIde: Boolean = false) = intellijDep(plugin, forIde)
 
 fun ModuleDependency.includeJars(vararg names: String, rootProject: Project? = null) {
     names.forEach {
         var baseName = it.removeSuffix(".jar")
-        if (rootProject != null && rootProject.extra.has("ignore.jar.$baseName")) {
+        if (rootProject != null && rootProject.extra.has("ignore.$baseName")) {
             return@forEach
         }
-        if (rootProject != null && rootProject.extra.has("versions.jar.$baseName")) {
-            baseName += "-${rootProject.extra["versions.jar.$baseName"]}"
+        if (rootProject != null && rootProject.extra.has("versions.$baseName")) {
+            baseName += "-${rootProject.extra["versions.$baseName"]}"
         }
         artifact {
             name = baseName
@@ -130,11 +113,4 @@ object IntellijRootUtils {
     }
 }
 
-@Suppress("UNCHECKED_CAST")
-fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilterPredicate: (String) -> Boolean = { true }): Unit =
-    includeJars(
-        *(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).filter(jarsFilterPredicate).toTypedArray(),
-        rootProject = project.rootProject
-    )
-
 fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project)

compiler/android-tests/build.gradle.kts

@@ -26,15 +26,11 @@ dependencies {
 
     testApi(commonDependency("junit:junit"))
 
-    testApi(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
-    testApi(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
-
-    testApi(intellijPluginDep("java")) { includeJars("jps-builders") }
-    testApi(jpsStandalone()) { includeJars("jps-model") }
+    testApi(jpsModel())
     testApi(jpsBuildTest())
 
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) }
+    testRuntimeOnly(intellijCore())
+    testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
 
     testApi("org.junit.platform:junit-platform-launcher:${commonDependencyVersion("org.junit.platform", "")}")
 }

compiler/backend-common/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     api(project(":core:descriptors"))
     api(project(":compiler:util"))
     api(project(":compiler:frontend"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/backend.common.jvm/build.gradle.kts

@@ -6,7 +6,8 @@ plugins {
 dependencies {
     api(project(":core:compiler.common.jvm"))
     api(project(":compiler:config.jvm"))
-    api(intellijCoreDep()) { includeJars("asm-all", "guava", rootProject = rootProject) }
+    api(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    api(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/backend/build.gradle.kts

@@ -11,8 +11,10 @@ dependencies {
     api(project(":compiler:frontend.java"))
     api(project(":compiler:serialization"))
     api(project(":compiler:backend.common.jvm"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
-    compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/build.gradle.kts

@@ -12,7 +12,7 @@ val otherCompilerModules = compilerModules.filter { it != path }
 val antLauncherJar by configurations.creating
 
 dependencies {
-    testImplementation(intellijDep()) { includeJars("platform-impl", rootProject = rootProject) } // Should come before compiler, because of "progarded" stuff needed for tests
+    testImplementation(intellijCore()) // Should come before compiler, because of "progarded" stuff needed for tests
 
     testApi(project(":kotlin-script-runtime"))
     testApi(project(":kotlin-test:kotlin-test-jvm"))
@@ -33,21 +33,10 @@ dependencies {
     testApi(project(":kotlin-scripting-compiler"))
     testApi(project(":kotlin-script-util"))
     testCompileOnly(project(":kotlin-reflect-api"))
+
     otherCompilerModules.forEach {
         testCompileOnly(project(it))
     }
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-
-    testRuntimeOnly(intellijDep()) {
-        includeJars(
-            "jps-model",
-            "streamex",
-            "idea_rt",
-            rootProject = rootProject
-        )
-    }
-
-    testRuntimeOnly(intellijPluginDep("java"))
 
     testImplementation(project(":kotlin-reflect"))
     testImplementation(toolsJar())

compiler/cli/build.gradle.kts

@@ -39,8 +39,8 @@ dependencies {
     compileOnly(project(":compiler:ir.tree.impl"))
 
     compileOnly(toolsJarApi())
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))

compiler/cli/cli-common/build.gradle.kts

@@ -10,8 +10,9 @@ dependencies {
     api(project(":js:js.config"))
     api(project(":native:kotlin-native-utils"))
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 }
 
 sourceSets {

compiler/cli/cli-js/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     api(project(":js:js.dce"))
     api(project(":js:js.sourcemap"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/compiler-runner-unshaded/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     compileOnly(project(":daemon-common"))
     compileOnly(project(":daemon-common-new"))
     compileOnly(project(":compiler:util"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/config.jvm/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api(project(":compiler:config"))
     api(project(":core:compiler.common.jvm"))
-    compileOnly(intellijCoreDep()) { includeJars("asm-all", rootProject = rootProject) }
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 }
 
 sourceSets {

compiler/config/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     api(project(":core:metadata"))
     api(project(":core:compiler.common"))
     api(project(":compiler:util"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/container/build.gradle.kts

@@ -7,14 +7,16 @@ dependencies {
     api(project(":core:util.runtime"))
     api(commonDependency("javax.inject"))
     compileOnly(kotlinStdlib())
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
     testApi(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
     testApi(project(":kotlin-test:kotlin-test-jvm"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi(commonDependency("junit:junit"))
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijDep()) { includeJars("trove4j", "util") }
+    testCompileOnly(intellijCore())
+
+    testRuntimeOnly(intellijCore())
+    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 }
 
 sourceSets {

compiler/daemon/build.gradle.kts

@@ -16,8 +16,8 @@ dependencies {
     compileOnly(project(":compiler:incremental-compilation-impl"))
     compileOnly(project(":daemon-common-new"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("trove4j") }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 
     runtimeOnly(project(":kotlin-reflect"))
 

compiler/daemon/daemon-client-new/build.gradle.kts

@@ -29,7 +29,6 @@ dependencies {
     compileOnly(project(":js:js.frontend"))
     compileOnly(project(":daemon-common")) { isTransitive = false }
     compileOnly(commonDependency("net.rubygrapefruit", "native-platform"))
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 
     embedded(project(":kotlin-daemon-client")) { isTransitive = false }
     embedded(project(":daemon-common")) { isTransitive = false }

compiler/daemon/daemon-client/build.gradle.kts

@@ -25,7 +25,6 @@ dependencies {
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":js:js.frontend"))
     compileOnly(commonDependency("net.rubygrapefruit", "native-platform"))
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 
     embedded(project(":daemon-common")) { isTransitive = false }
     embedded(commonDependency("net.rubygrapefruit", "native-platform"))

compiler/daemon/daemon-common-new/build.gradle.kts

@@ -9,11 +9,8 @@ val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
 dependencies {
     compileOnly(project(":daemon-common"))
     api(kotlinStdlib())
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
-        isTransitive = false
-    }
+    compileOnly(intellijCore())
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     api(commonDependency("io.ktor", "ktor-network")) {
         ktorExcludesForDaemon.forEach { (group, module) ->
             exclude(group = group, module = module)

compiler/daemon/daemon-common/build.gradle.kts

@@ -8,11 +8,8 @@ dependencies {
     api(project(":kotlin-build-common"))
     api(kotlinStdlib())
     compileOnly(project(":js:js.config"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
-        isTransitive = false
-    }
+    compileOnly(intellijCore())
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 }
 
 sourceSets {

compiler/daemon/daemon-tests/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
         }
     }
     testImplementation(project(":kotlin-daemon"))
-    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijCore())
 }
 
 sourceSets {

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

@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
 
     testApi(projectTests(":compiler:test-infrastructure"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
@@ -31,11 +31,11 @@ dependencies {
     testRuntimeOnly(project(":core:descriptors.runtime"))
     testRuntimeOnly(project(":compiler:fir:fir2ir:jvm-backend"))
 
-    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijDep()) {
-        includeJars("intellij-deps-fastutil-8.4.1-4", "jps-model", "streamex", "jna", rootProject = rootProject)
-    }
+    testImplementation(intellijCore())
 
+    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
+    testRuntimeOnly(commonDependency("one.util:streamex"))
+    testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
     testRuntimeOnly(toolsJar())
 }
 

compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
 
     testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
@@ -26,9 +26,8 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijDep()) { includeJars("idea_rt", "streamex", "jps-model", rootProject = rootProject) }
+    testCompileOnly(intellijCore())
+    testRuntimeOnly(intellijCore())
 }
 
 val generationRoot = projectDir.resolve("tests-gen")

compiler/fir/checkers/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     implementation(project(":compiler:psi"))
 
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/checkers/checkers-component-generator/build.gradle.kts

@@ -13,10 +13,11 @@ dependencies {
     implementation(project(":kotlin-reflect-api"))
 
     /*
-     We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCoreDep
+     We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCore
      the same as it is in `:fir:tree:tree-generator` module to the project be imported correctly
     */
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 
     implementation(project(":compiler:psi"))
 }

compiler/fir/checkers/checkers.jvm/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation(project(":compiler:psi"))
 
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/cones/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     api(project(":core:compiler.common"))
     api(kotlinxCollectionsImmutable())
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/dump/build.gradle.kts

@@ -21,9 +21,8 @@ dependencies {
 
     implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12")
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("commons-lang-2.4") }
-
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("commons-lang:commons-lang"))
 }
 
 sourceSets {

compiler/fir/entrypoint/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     implementation(project(":compiler:ir.tree.impl"))
 
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/fir-deserialization/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     api(project(":compiler:fir:providers"))
     api(project(":compiler:fir:semantics"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/fir-serialization/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     api(project(":compiler:fir:providers"))
     api(project(":compiler:fir:semantics"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/fir2ir/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     compileOnly(project(":compiler:ir.psi2ir"))
     compileOnly(project(":compiler:ir.backend.common"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
@@ -38,14 +38,15 @@ dependencies {
     testRuntimeOnly(project(":compiler:fir:fir2ir:jvm-backend"))
     testRuntimeOnly(project(":generators"))
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
+    testRuntimeOnly(intellijCore())
 
-    testRuntimeOnly(intellijDep()) {
-        includeJars("jna", rootProject = rootProject)
-    }
+    testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
+    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
+    testRuntimeOnly(commonDependency("one.util:streamex"))
 
-    testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4", "jps-model", "streamex", rootProject = rootProject) }
+    testRuntimeOnly(jpsModel())
+    testRuntimeOnly(jpsModelImpl())
 }
 
 val generationRoot = projectDir.resolve("tests-gen")

compiler/fir/fir2ir/jvm-backend/build.gradle.kts

@@ -19,7 +19,8 @@ dependencies {
     compileOnly(project(":compiler:backend.jvm"))
     api(project(":compiler:ir.serialization.common"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 }
 
 sourceSets {

compiler/fir/java/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 
     implementation(project(":core:deserialization.common.jvm"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 

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

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.cli.common.toBooleanLenient
-
 /*
  * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
@@ -15,16 +13,10 @@ repositories {
 }
 
 dependencies {
-    testApi(intellijCoreDep()) { includeJars("intellij-core")}
-    testApi(intellijDep()) {
-        includeJars("extensions", "idea_rt", "util", "asm-all", "jna", rootProject = rootProject)
-    }
-
-    testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
+    testApi(intellijCore())
 
     testRuntimeOnly("xerces:xercesImpl:2.12.0")
-    testRuntimeOnly(intellijPluginDep("java"))
-    testRuntimeOnly(intellijDep()) { includeJars("commons-lang-2.4") }
+    testRuntimeOnly(commonDependency("commons-lang:commons-lang"))
 
     testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))

compiler/fir/providers/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":core:util.runtime"))
 
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("guava", rootProject = rootProject) }
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/fir/raw-fir/light-tree2fir/build.gradle.kts

@@ -21,7 +21,8 @@ dependencies {
     implementation(project(":compiler:psi"))
     implementation(kotlinxCollectionsImmutable())
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 
     testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
@@ -38,8 +39,8 @@ dependencies {
     implementation("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion)
     implementation("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion)
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
+    testRuntimeOnly(intellijCore())
 }
 
 val generationRoot = projectDir.resolve("tests-gen")

compiler/fir/raw-fir/psi2fir/build.gradle.kts

@@ -15,9 +15,8 @@ dependencies {
     implementation(project(":compiler:psi"))
     implementation(kotlinxCollectionsImmutable())
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
-
-    testImplementation(intellijDep()) { includeJars("platform-api", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 
     testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
@@ -29,8 +28,8 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
+    testRuntimeOnly(intellijCore())
 }
 
 val generationRoot = projectDir.resolve("tests-gen")

compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt

@@ -5,9 +5,6 @@
 
 package org.jetbrains.kotlin.fir.builder
 
-import com.intellij.openapi.fileTypes.FileTypeManager
-import com.intellij.openapi.fileTypes.FileTypeRegistry
-import com.intellij.openapi.util.Getter
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.io.FileUtilRt
 import com.intellij.psi.PsiFile
@@ -177,12 +174,6 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase(
             return element
         }
     }
-
-    override fun tearDown() {
-        super.tearDown()
-        FileTypeRegistry.ourInstanceGetter = Getter<FileTypeRegistry> { FileTypeManager.getInstance() }
-    }
-
 }
 
 private fun throwTwiceVisitingError(element: FirElement) {

compiler/fir/raw-fir/raw-fir.common/build.gradle.kts

@@ -14,10 +14,11 @@ dependencies {
     implementation(kotlinxCollectionsImmutable())
     implementation(project(":compiler:psi"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
+    testRuntimeOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/resolve/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     implementation(project(":core:util.runtime"))
 
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("guava", rootProject = rootProject) }
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/fir/semantics/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     implementation(project(":core:util.runtime"))
 
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep()) { includeJars("guava", rootProject = rootProject) }
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/fir/tree/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     api(project(":compiler:fir:cones"))
 
     // Necessary only to store bound PsiElement inside FirElement
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/fir/tree/tree-generator/build.gradle.kts

@@ -16,12 +16,10 @@ dependencies {
     implementation(project(":compiler:frontend.common"))
     implementation(project(":compiler:fir:cones"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
-    compileOnly(intellijDep()) {
-        includeJars("trove4j", rootProject = rootProject)
-    }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 
-    runtimeOnly(intellijCoreDep()) { includeJars("jdom") }
+    runtimeOnly(commonDependency("org.jetbrains.intellij.deps:jdom"))
 }
 
 val writeCopyright by task<WriteCopyrightToFile> {

compiler/frontend.common-psi/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api(project(":compiler:frontend.common"))
     api(project(":compiler:psi"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/frontend.common/build.gradle.kts

@@ -6,8 +6,8 @@ plugins {
 dependencies {
     api(project(":compiler:config"))
     api(project(":compiler:container"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/frontend.java/build.gradle.kts

@@ -11,8 +11,10 @@ dependencies {
     api("javax.annotation:jsr250-api:1.0")
     api(project(":compiler:frontend"))
     api(project(":compiler:resolution.common.jvm"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/frontend/build.gradle.kts

@@ -16,8 +16,9 @@ dependencies {
     api(project(":compiler:frontend.common-psi"))
     api(project(":kotlin-script-runtime"))
     api(commonDependency("io.javaslang","javaslang"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/frontend/cfg/build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
 
 dependencies {
     api(project(":compiler:frontend"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/incremental-compilation-impl/build.gradle.kts

@@ -15,19 +15,20 @@ dependencies {
     api(project(":compiler:cli-js"))
     api(project(":kotlin-build-common"))
     api(project(":daemon-common"))
-    implementation("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    implementation(commonDependency("com.google.code.gson:gson"))
+    compileOnly(intellijCore())
 
     testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi(kotlinStdlib())
     testApi(projectTests(":kotlin-build-common"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(intellijCoreDep()) { includeJars("intellij-core") }
-    testApi(intellijDep()) { includeJars("log4j", "jdom") }
+    testApi(intellijCore())
+    testApi(commonDependency("org.jetbrains.intellij.deps:log4j"))
+    testApi(commonDependency("org.jetbrains.intellij.deps:jdom"))
+
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
-    testRuntimeOnly(intellijDep()) { includeJars("lz4-java", "jna", "idea_rt", rootProject = rootProject) }
 }
 
 sourceSets {

compiler/ir/backend.common/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     api(project(":compiler:backend-common"))
     api(project(":compiler:ir.tree"))
     api(project(":compiler:ir.interpreter"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/backend.js/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     api(project(":js:js.frontend"))
     api(project(":js:js.sourcemap"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/backend.jvm/build.gradle.kts

@@ -9,7 +9,8 @@ dependencies {
     api(project(":compiler:ir.backend.common"))
     api(project(":compiler:backend.common.jvm"))
     compileOnly(project(":compiler:ir.tree.impl"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 }
 
 sourceSets {

compiler/ir/backend.jvm/codegen/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     api(project(":compiler:ir.backend.common"))
     api(project(":compiler:backend.jvm"))
     implementation(project(":compiler:ir.tree.impl"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/backend.jvm/entrypoint/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     api(project(":compiler:ir.serialization.jvm"))
     implementation(project(":compiler:backend.jvm.lower"))
     implementation(project(":compiler:backend.jvm.codegen"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/backend.jvm/lower/build.gradle.kts

@@ -8,8 +8,8 @@ dependencies {
     api(project(":compiler:ir.backend.common"))
     api(project(":compiler:backend.jvm"))
     implementation(project(":compiler:ir.tree.impl"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
-    compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 }
 
 sourceSets {

compiler/ir/backend.wasm/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     api(project(":compiler:backend.js"))
     api(project(":wasm:wasm.ir"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/ir.psi2ir/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     api(project(":compiler:frontend"))
     api(project(":compiler:backend-common"))
     api(project(":compiler:ir.tree"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/ir.tree.impl/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":compiler:ir.tree"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/ir.tree/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     implementation(project(":compiler:util"))
     implementation(project(":compiler:config"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/serialization.common/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation(project(":compiler:psi"))
     compileOnly(project(":kotlin-reflect-api"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/ir/serialization.js/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation(project(":compiler:ir.backend.common"))
     compileOnly(project(":kotlin-reflect-api"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/javac-wrapper/build.gradle.kts

@@ -8,8 +8,7 @@ dependencies {
     api(project(":compiler:frontend.java"))
 
     compileOnly(toolsJarApi())
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/light-classes/build.gradle.kts

@@ -9,11 +9,10 @@ dependencies {
     api(project(":compiler:backend"))
     api(project(":compiler:frontend"))
     api(project(":compiler:frontend.java"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-
-    compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
-
-    compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/plugin-api/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 dependencies {
     api(project(":compiler:util"))
     api(project(":compiler:frontend"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/preloader/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 }
 
 sourceSets {

compiler/psi/build.gradle.kts

@@ -15,8 +15,9 @@ dependencies {
     api(project(":compiler:frontend.common"))
     api(project(":kotlin-script-runtime"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("com.google.guava:guava"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 
     jflexPath(commonDependency("org.jetbrains.intellij.deps.jflex", "jflex"))
 }

compiler/resolution.common.jvm/build.gradle.kts

@@ -9,8 +9,10 @@ dependencies {
     api(project(":compiler:psi"))
     implementation(project(":compiler:util"))
     implementation(commonDependency("io.javaslang","javaslang"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    compileOnly(commonDependency("com.google.guava:guava"))
 }
 
 sourceSets {

compiler/resolution/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     api(project(":compiler:util"))
     api(project(":core:descriptors"))
     api(project(":compiler:resolution.common"))
-    compileOnly(intellijDep()) { includeJars("trove4j") }
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 }
 
 sourceSets {

compiler/serialization/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     api(project(":core:deserialization"))
     api(project(":compiler:util"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/test-infrastructure-utils/build.gradle.kts

@@ -6,17 +6,14 @@ plugins {
 dependencies {
     testImplementation(project(":compiler:fir:entrypoint"))
     testImplementation(project(":compiler:cli"))
-    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijCore())
 
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    testImplementation(intellijDep()) {
     // This dependency is needed only for FileComparisonFailure
-        includeJars("idea_rt", rootProject = rootProject)
-        isTransitive = false
-    }
+    testImplementation(intellijJavaRt())
 }
 
 sourceSets {

compiler/test-infrastructure/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
     testApi(project(":compiler:fir:entrypoint"))
     testApi(project(":compiler:cli"))
-    testApi(intellijCoreDep()) { includeJars("intellij-core") }
+    testApi(intellijCore())
 
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntimeOnly(project(":kotlin-reflect"))
@@ -14,9 +14,7 @@ dependencies {
 
     testImplementation(projectTests(":compiler:test-infrastructure-utils"))
 
-    testRuntimeOnly(intellijDep()) {
-        includeJars("jna", rootProject = rootProject)
-    }
+    testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
 }
 
 sourceSets {

compiler/tests-against-klib/build.gradle.kts

@@ -11,8 +11,8 @@ dependencies {
     testApi(projectTests(":generators:test-generator"))
     testApi(projectTests(":compiler:tests-common"))
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
+    testRuntimeOnly(intellijCore())
 }
 
 sourceSets {

compiler/tests-common-new/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     testApi(project(":compiler:cli"))
     testImplementation(project(":compiler:ir.tree.impl"))
     testImplementation(project(":compiler:backend.jvm.entrypoint"))
-    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijCore())
 
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntimeOnly(project(":kotlin-reflect"))
@@ -29,17 +29,12 @@ dependencies {
      *   declared as Api dependencies to propagate them to all modules
      *   which depend on current one
      */
-    testApi(intellijDep()) {
-        includeJars(
-            "intellij-deps-fastutil-8.4.1-4",
-            "idea_rt",
-            "jps-model",
-            "platform-impl",
-            "streamex",
-            "jna",
-            rootProject = rootProject
-        )
-    }
+    testApi(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
+    testApi(commonDependency("one.util:streamex"))
+    testApi(commonDependency("net.java.dev.jna:jna"))
+    testApi(jpsModel()) { isTransitive = false }
+    testApi(jpsModelImpl()) { isTransitive = false }
+    testApi(intellijJavaRt())
 
     testApi(toolsJar())
 }

compiler/tests-common/build.gradle.kts

@@ -57,34 +57,26 @@ dependencies {
     testApi(commonDependency("com.android.tools:r8"))
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompileOnly(toolsJar())
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
 
     /*
      * Actually those dependencies are needed only at runtime, but they
      *   declared as Api dependencies to propagate them to all modules
      *   which depend on current one
      */
-    testApi(intellijDep()) {
-        includeJars(
-            "intellij-deps-fastutil-8.4.1-4",
-            "idea_rt",
-            "jps-model",
-            "platform-impl",
-            "streamex",
-            "jna",
-            rootProject = rootProject
-        )
-    }
-    testImplementation(intellijDep()) {
-        includeJars(
-            "guava",
-            "trove4j",
-            "asm-all",
-            "log4j",
-            "jdom",
-            rootProject = rootProject
-        )
-    }
+    testApi(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
+    testApi(commonDependency("one.util:streamex"))
+    testApi(commonDependency("net.java.dev.jna:jna"))
+    testApi(jpsModel()) { isTransitive = false }
+    testApi(jpsModelImpl()) { isTransitive = false }
+    testApi(intellijJavaRt())
+
+    testImplementation(commonDependency("com.google.guava:guava"))
+    testImplementation(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    testImplementation(commonDependency("org.jetbrains.intellij.deps:log4j"))
+    testImplementation(commonDependency("org.jetbrains.intellij.deps:jdom"))
+
     testApiJUnit5()
 }
 

compiler/tests-compiler-utils/build.gradle.kts

@@ -27,19 +27,13 @@ dependencies {
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(project(":kotlin-preloader"))
     testApi(commonDependency("com.android.tools:r8"))
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCore())
 
-    testApi(intellijDep()) {
-        includeJars(
-            "guava",
-            "trove4j",
-            "asm-all",
-            "log4j",
-            "jdom",
-            rootProject = rootProject
-        )
-        isTransitive = false
-    }
+    testApi(commonDependency("com.google.guava:guava"))
+    testApi(commonDependency("org.jetbrains.intellij.deps:trove4j"))
+    testApi(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    testApi(commonDependency("org.jetbrains.intellij.deps:log4j"))
+    testApi(commonDependency("org.jetbrains.intellij.deps:jdom"))
 }
 
 sourceSets {

compiler/tests-different-jdk/build.gradle.kts

@@ -14,9 +14,8 @@ dependencies {
 
     testApiJUnit5(vintageEngine = true, runner = true, suiteApi = true)
 
-    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijCore())
     testRuntimeOnly(project(":kotlin-reflect"))
-    testRuntimeOnly(intellijDep())
     testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
 }
 

compiler/tests-java8/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     kotlin("jvm")
     id("jps-compatible")
@@ -8,15 +6,14 @@ plugins {
 dependencies {
     testApi(project(":kotlin-scripting-compiler"))
     testApi(projectTests(":compiler:tests-common"))
-    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijCore())
     testApi(projectTests(":generators:test-generator"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(toolsJar())
 
-    testRuntimeOnly(intellijPluginDep("java"))
-
-    if (kotlinBuildProperties.isInJpsBuildIdeaSync)
+    if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
         testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
+    }
 }
 
 sourceSets {

compiler/tests-spec/build.gradle.kts

@@ -5,18 +5,14 @@ plugins {
 
 dependencies {
     testApi(projectTests(":compiler"))
+
     testImplementation(projectTests(":compiler:test-infrastructure"))
     testImplementation(projectTests(":compiler:tests-common-new"))
 
-    testApi(intellijDep()) {
-        includeJars("gson", "groovy", "groovy-xml", rootProject = rootProject)
-    }
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijDep()) {
-        includeJars("streamex", rootProject = rootProject)
-    }
+    testApi(commonDependency("com.google.code.gson:gson"))
+    testApi(commonDependency("org.codehaus.groovy:groovy"))
+    testApi(commonDependency("org.codehaus.groovy:groovy-xml"))
 
-    testRuntimeOnly(intellijPluginDep("java"))
     api("org.jsoup:jsoup:1.14.2")
 
     if (kotlinBuildProperties.isInJpsBuildIdeaSync) {

compiler/util/build.gradle.kts

@@ -7,9 +7,11 @@ dependencies {
     api(kotlinStdlib())
     api(project(":compiler:compiler.version"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    compileOnly(jpsStandalone()) { includeJars("jps-model") }
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:log4j"))
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(jpsModel()) { isTransitive = false }
+    compileOnly(jpsModelImpl()) { isTransitive = false }
 }
 
 sourceSets {

compiler/visualizer/build.gradle.kts

@@ -19,8 +19,8 @@ dependencies {
     testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testImplementation(projectTests(":generators:test-generator"))
 
-    testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
-    testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) }
+    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
+    testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
 }
 
 val generationRoot = projectDir.resolve("tests-gen")

compiler/visualizer/common/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":compiler:frontend"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/visualizer/render-fir/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     api(project(":compiler:fir:raw-fir:psi2fir"))
     api(project(":compiler:fir:resolve"))
     api(project(":compiler:visualizer:common"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

compiler/visualizer/render-psi/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":compiler:visualizer:common"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCore())
 }
 
 sourceSets {

core/descriptors.runtime/build.gradle.kts

@@ -25,9 +25,7 @@ dependencies {
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":generators:test-generator"))
 
-    testApi(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "idea_rt", rootProject = rootProject) }
-    testRuntimeOnly(jpsStandalone()) { includeJars("jps-model") }
+    testApi(intellijCore())
 }
 
 sourceSets {