azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Add kotlin.build.dependencies.dir property

Browse Source 
To specify directory downloaded dependencies stored in

 #KT-30310
This commit is contained in:
Vyacheslav Gerasimov
2019-08-05 00:46:50 +03:00
parent 1d0ba4edd4
commit 659c399d30
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/prepare-deps/build.gradle.kts
+5 -1
View File
@@ -104,7 +104,11 @@ val nodeJSPlugin by configurations.creating
*/ */
val intellijRuntimeAnnotations = "intellij-runtime-annotations" 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 customDepsOrg: String by rootProject.extra
val customDepsRevision = intellijVersion val customDepsRevision = intellijVersion
val repoDir = File(customDepsRepoDir, customDepsOrg) val repoDir = File(customDepsRepoDir, customDepsOrg)
buildSrc/src/main/kotlin/localDependencies.kt
+4 -1
View File
@@ -26,7 +26,10 @@ import org.gradle.api.tasks.JavaExec
import org.gradle.kotlin.dsl.* import org.gradle.kotlin.dsl.*
import java.io.File 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) { private fun Project.ideModuleName() = when (IdeVersionConfigurator.currentIde.kind) {
Ide.Kind.AndroidStudio -> "android-studio-ide" Ide.Kind.AndroidStudio -> "android-studio-ide"