diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt index 0dd8b946e9f..40b4861a46f 100644 --- a/buildSrc/src/main/kotlin/intellijDependencies.kt +++ b/buildSrc/src/main/kotlin/intellijDependencies.kt @@ -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) = includeJars(*(project.rootProject.extra["IntellijCoreDependencies"] as List).toTypedArray(), rootProject = project.rootProject) @@ -89,7 +96,7 @@ fun Project.isIntellijCommunityAvailable() = !(rootProject.extra["intellijUltima fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean) 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() = if (isIntellijUltimateSdkAvailable()) diff --git a/buildSrc/src/main/kotlin/pill/plugin.kt b/buildSrc/src/main/kotlin/pill/plugin.kt index 1d7b5a071cc..774fa2f4057 100644 --- a/buildSrc/src/main/kotlin/pill/plugin.kt +++ b/buildSrc/src/main/kotlin/pill/plugin.kt @@ -102,7 +102,7 @@ class JpsCompatiblePlugin : Plugin { platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString() platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() } ?: 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) {