From b831b8ab92a5fde08900761676e2936fad13812d Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 19 Feb 2018 21:01:59 +0300 Subject: [PATCH] Introduce intellijEnforceCommunitySdk flag to disable ultimate repo --- build.gradle.kts | 6 ------ buildSrc/src/main/kotlin/CommonUtil.kt | 6 ++++++ buildSrc/src/main/kotlin/intellijDependencies.kt | 14 ++++++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bbd55aba030..700c633a2cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -138,12 +138,6 @@ extra["versions.jflex"] = "1.7.0" val markdownVer = "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin" extra["markdownParserRepo"] = "https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/$markdownVer/([artifact]_[ext]/)[artifact](.[ext])" -fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let { - val v = it.toString() - if (v.isBlank()) true - else v.toBoolean() -} - val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false) diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt index 45c2df70812..033a7dfa659 100644 --- a/buildSrc/src/main/kotlin/CommonUtil.kt +++ b/buildSrc/src/main/kotlin/CommonUtil.kt @@ -56,3 +56,9 @@ fun Project.generator(fqName: String) = task { main = fqName workingDir = rootDir } + +fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let { + val v = it.toString() + if (v.isBlank()) true + else v.toBoolean() +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt index 8d54a827d27..0dd8b946e9f 100644 --- a/buildSrc/src/main/kotlin/intellijDependencies.kt +++ b/buildSrc/src/main/kotlin/intellijDependencies.kt @@ -30,14 +30,20 @@ private fun Project.intellijRepoDir() = File("${project.rootDir.absoluteFile}/bu fun RepositoryHandler.intellijSdkRepo(project: Project): IvyArtifactRepository = ivy { val baseDir = project.intellijRepoDir() + val intellijEnforceCommunitySdk = project.getBooleanProperty("intellijEnforceCommunitySdk") == true + setUrl(baseDir) - ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate.ivy.xml") + + if (!intellijEnforceCommunitySdk) { + ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate.ivy.xml") + ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellijUltimate.plugin.[module].ivy.xml") + artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate/lib/[artifact](-[classifier]).jar") + artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellijUltimate/plugins/[module]/lib/[artifact](-[classifier]).jar") + } + ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module].ivy.xml") - ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellijUltimate.plugin.[module].ivy.xml") ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellij.plugin.[module].ivy.xml") - artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate/lib/[artifact](-[classifier]).jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/lib/[artifact](-[classifier]).jar") - artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellijUltimate/plugins/[module]/lib/[artifact](-[classifier]).jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellij/plugins/[module]/lib/[artifact](-[classifier]).jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/plugins-[module]/[module]/lib/[artifact](-[classifier]).jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/[artifact].jar")