From 659c399d30656faf5666a5a5ca2d2d295efc8eef Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 5 Aug 2019 00:46:50 +0300 Subject: [PATCH] Build: Add `kotlin.build.dependencies.dir` property To specify directory downloaded dependencies stored in #KT-30310 --- buildSrc/prepare-deps/build.gradle.kts | 6 +++++- buildSrc/src/main/kotlin/localDependencies.kt | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/buildSrc/prepare-deps/build.gradle.kts b/buildSrc/prepare-deps/build.gradle.kts index 670771a3948..a2a51990475 100644 --- a/buildSrc/prepare-deps/build.gradle.kts +++ b/buildSrc/prepare-deps/build.gradle.kts @@ -104,7 +104,11 @@ val nodeJSPlugin by configurations.creating */ val intellijRuntimeAnnotations = "intellij-runtime-annotations" -val customDepsRepoDir = rootProject.rootDir.parentFile.resolve("dependencies/repo") +val dependenciesDir = (findProperty("kotlin.build.dependencies.dir") as String?)?.let(::File) + ?: rootProject.rootDir.parentFile.resolve("dependencies") + +val customDepsRepoDir = dependenciesDir.resolve("repo") + val customDepsOrg: String by rootProject.extra val customDepsRevision = intellijVersion val repoDir = File(customDepsRepoDir, customDepsOrg) diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt index 73af2c20f52..31f5e6fdffd 100644 --- a/buildSrc/src/main/kotlin/localDependencies.kt +++ b/buildSrc/src/main/kotlin/localDependencies.kt @@ -26,7 +26,10 @@ import org.gradle.api.tasks.JavaExec import org.gradle.kotlin.dsl.* import java.io.File -private fun Project.kotlinBuildLocalRepoDir() = File("${project.rootDir.absoluteFile}/dependencies/repo") +private fun Project.kotlinBuildLocalDependenciesDir(): File = + (findProperty("kotlin.build.dependencies.dir") as String?)?.let(::File) ?: project.rootDir.absoluteFile.resolve("dependencies") + +private fun Project.kotlinBuildLocalRepoDir(): File = kotlinBuildLocalDependenciesDir().resolve("repo") private fun Project.ideModuleName() = when (IdeVersionConfigurator.currentIde.kind) { Ide.Kind.AndroidStudio -> "android-studio-ide"