From 9294a74bf2b93d52935ef829faf569753fa5ffef Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Tue, 18 Jul 2023 10:25:03 +0200
Subject: [PATCH] [repo] Fix 'prepare-deps' sub-project was not included in
 build

---
 .../buildsrc-compat/build.gradle.kts          | 26 --------------
 .../prepare-deps/build.gradle.kts             | 34 +++++++++++++++----
 2 files changed, 27 insertions(+), 33 deletions(-)
 rename repo/gradle-build-conventions/{buildsrc-compat => }/prepare-deps/build.gradle.kts (93%)

diff --git a/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts
index 9b77e2a426b..a94c6e8fd92 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts
+++ b/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts
@@ -17,10 +17,6 @@ logger.info("buildSrcKotlinVersion: " + extra["bootstrapKotlinVersion"])
 logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
 logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
 
-apply {
-    from("../../../gradle/checkCacheability.gradle.kts")
-}
-
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
@@ -40,28 +36,6 @@ gradlePlugin {
     }
 }
 
-fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {
-    val v = it.toString()
-    if (v.isBlank()) true
-    else v.toBoolean()
-}
-
-project.apply {
-    from(rootProject.file("../../gradle/versions.gradle.kts"))
-}
-
-val isTeamcityBuild = kotlinBuildProperties.isTeamcityBuild
-val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
-
-extra["intellijReleaseType"] = when {
-    extra["versions.intellijSdk"]?.toString()?.contains("-EAP-") == true -> "snapshots"
-    extra["versions.intellijSdk"]?.toString()?.endsWith("SNAPSHOT") == true -> "nightly"
-    else -> "releases"
-}
-
-extra["versions.androidDxSources"] = "5.0.0_r2"
-extra["customDepsOrg"] = "kotlin.build"
-
 repositories {
     mavenCentral()
     google()
diff --git a/repo/gradle-build-conventions/buildsrc-compat/prepare-deps/build.gradle.kts b/repo/gradle-build-conventions/prepare-deps/build.gradle.kts
similarity index 93%
rename from repo/gradle-build-conventions/buildsrc-compat/prepare-deps/build.gradle.kts
rename to repo/gradle-build-conventions/prepare-deps/build.gradle.kts
index b626b2584c9..77bd6f24d5d 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/prepare-deps/build.gradle.kts
+++ b/repo/gradle-build-conventions/prepare-deps/build.gradle.kts
@@ -13,15 +13,36 @@ import javax.xml.stream.XMLOutputFactory
 
 plugins {
     base
+    id("org.jetbrains.kotlin.jvm")
 }
 
-val intellijReleaseType: String by rootProject.extra
-val intellijVersion = rootProject.extra["versions.intellijSdk"] as String
+fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {
+    val v = it.toString()
+    if (v.isBlank()) true
+    else v.toBoolean()
+}
+
+project.apply {
+    from(rootProject.file("../../gradle/versions.gradle.kts"))
+}
+
+val isTeamcityBuild = kotlinBuildProperties.isTeamcityBuild
+
+val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
+val intellijReleaseType: String by extra {
+    when {
+        extra["versions.intellijSdk"]?.toString()?.contains("-EAP-") == true -> "snapshots"
+        extra["versions.intellijSdk"]?.toString()?.endsWith("SNAPSHOT") == true -> "nightly"
+        else -> "releases"
+    }
+}
+val customDepsOrg: String by extra("kotlin.build")
+
+val intellijVersion = project.extra["versions.intellijSdk"] as String
 val intellijVersionForIde = rootProject.intellijSdkVersionForIde()
-val asmVersion = rootProject.findProperty("versions.jar.asm-all") as String?
-val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelease") as String?
-val androidStudioBuild = rootProject.findProperty("versions.androidStudioBuild") as String?
-val intellijSeparateSdks: Boolean by rootProject.extra
+val asmVersion = project.findProperty("versions.jar.asm-all") as String?
+val androidStudioRelease = project.findProperty("versions.androidStudioRelease") as String?
+val androidStudioBuild = project.findProperty("versions.androidStudioBuild") as String?
 
 fun checkIntellijVersion(intellijVersion: String) {
     val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-'))
@@ -92,7 +113,6 @@ val dependenciesDir = (findProperty("kotlin.build.dependencies.dir") as String?)
 
 val customDepsRepoDir = dependenciesDir.resolve("repo")
 
-val customDepsOrg: String by rootProject.extra
 val repoDir = File(customDepsRepoDir, customDepsOrg)
 
 dependencies {