Fix cooperative development setup for kt-master

buildSrc/prepare-deps/build.gradle.kts

@@ -208,10 +208,17 @@ fun prepareDeps(
     }
 }
 
-if (intellijVersionForIde != null) {
-    prepareDeps(intellijForIde, intellijCoreForIde, sourcesForIde, jpsStandaloneForIde, intellijVersionForIde)
+when(kotlinBuildProperties.getOrNull("attachedIntellijVersion")) {
+    null -> {}
+    "master" -> {} // for intellij/kt-master, intellij maven artifacts are used instead of manual unpacked dependencies
+    else -> {
+        val intellijVersionForIde = intellijVersionForIde
+            ?: error("intellijVersionForIde should not be null as attachedIntellijVersion is present")
+        prepareDeps(intellijForIde, intellijCoreForIde, sourcesForIde, jpsStandaloneForIde, intellijVersionForIde)
+    }
 }
 
+
 tasks.named<Delete>("clean") {
     delete(customDepsRepoDir)
 }

buildSrc/src/main/kotlin/localDependencies.kt

@@ -74,14 +74,27 @@ fun RepositoryHandler.kotlinBuildLocalRepo(project: Project): IvyArtifactReposit
     }
 }
 
+/* <used only for cooperative development for non kt-master branches> */
 @JvmOverloads
 fun Project.intellijDep(module: String? = null, forIde: Boolean = false) =
     "kotlin.build:${module ?: ideModuleName()}:${ideModuleVersion(forIde)}"
 
+
 fun Project.intellijCoreDep() = "kotlin.build:intellij-core:${rootProject.extra["versions.intellijSdk"]}"
 
 fun Project.intellijPluginDep(plugin: String, forIde: Boolean = false) = intellijDep(plugin, forIde)
 
+/* </used only for cooperative development for non kt-master branches> */
+
+
+/* <used only for cooperative development for kt-master branch> */
+fun Project.intellijMavenDep(subsystem: String, artifact: String) =
+    "com.jetbrains.$subsystem:$artifact:${ideModuleVersion(forIde = true)}"
+
+
+/* </used only for cooperative development for kt-master branch> */
+
+
 fun ModuleDependency.includeJars(vararg names: String, rootProject: Project? = null) {
     names.forEach {
         var baseName = it.removeSuffix(".jar")