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

Pill, Minor: Remove the hardcoded repository, use the available utilities

Browse Source
This commit is contained in:
Yan Zhulanow
2018-02-22 21:04:16 +03:00
parent b24d87f7ed
commit 3894afcf0b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/intellijDependencies.kt
+8 -1
View File
@@ -78,6 +78,13 @@ fun ModuleDependency.includeJars(vararg names: String, rootProject: Project? = n
} }
} }
// Workaround. Top-level Kotlin function in a default package can't be called from a non-default package
object IntellijRootUtils {
fun getRepositoryRootDir(project: Project): File = with (project.rootProject) {
return File(intellijRepoDir(), "kotlin.build.custom.deps/${extra["versions.intellijSdk"]}")
}
}
fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) = fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) =
includeJars(*(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).toTypedArray(), rootProject = project.rootProject) includeJars(*(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).toTypedArray(), rootProject = project.rootProject)
@@ -89,7 +96,7 @@ fun Project.isIntellijCommunityAvailable() = !(rootProject.extra["intellijUltima
fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean) fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean)
fun Project.intellijRootDir() = fun Project.intellijRootDir() =
File(intellijRepoDir(), "kotlin.build.custom.deps/${rootProject.extra["versions.intellijSdk"]}/intellij${if (isIntellijCommunityAvailable()) "" else "Ultimate"}") File(IntellijRootUtils.getRepositoryRootDir(this), "intellij${if (isIntellijCommunityAvailable()) "" else "Ultimate"}")
fun Project.intellijUltimateRootDir() = fun Project.intellijUltimateRootDir() =
if (isIntellijUltimateSdkAvailable()) if (isIntellijUltimateSdkAvailable())
buildSrc/src/main/kotlin/pill/plugin.kt
+1 -1
View File
@@ -102,7 +102,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString() platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString()
platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() } platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() }
?: error("Invalid platform version: $platformVersion") ?: error("Invalid platform version: $platformVersion")
platformDir = File(projectDir, "buildSrc/prepare-deps/intellij-sdk/build/repo/kotlin.build.custom.deps/$platformVersion") platformDir = IntellijRootUtils.getRepositoryRootDir(project)
} }
private fun pill(project: Project) { private fun pill(project: Project) {