From 9f64e0fa699aa76fd85e5dec519beb04a6221777 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 4 Mar 2019 14:08:23 +0300 Subject: [PATCH] Build: Remove intellijEnforceCommunitySdk flag, use `currentIde` instead Setup ultimate repositories only when currentIde is Intellij --- buildSrc/src/main/kotlin/intellijDependencies.kt | 4 +--- gradle.properties.as32 | 1 - gradle.properties.as33 | 1 - gradle.properties.as34 | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt index bb6cf0bcd95..1c75299b6da 100644 --- a/buildSrc/src/main/kotlin/intellijDependencies.kt +++ b/buildSrc/src/main/kotlin/intellijDependencies.kt @@ -30,11 +30,9 @@ 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) - if (!intellijEnforceCommunitySdk) { + if (IdeVersionConfigurator.currentIde.kind == Ide.Kind.IntelliJ) { 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") diff --git a/gradle.properties.as32 b/gradle.properties.as32 index d5407a7a888..0ebec85453a 100644 --- a/gradle.properties.as32 +++ b/gradle.properties.as32 @@ -10,4 +10,3 @@ kotlin.compiler.newInferenceEnabled=true #signingRequired=true intellijUltimateEnabled=false -intellijEnforceCommunitySdk=true \ No newline at end of file diff --git a/gradle.properties.as33 b/gradle.properties.as33 index d5407a7a888..0ebec85453a 100644 --- a/gradle.properties.as33 +++ b/gradle.properties.as33 @@ -10,4 +10,3 @@ kotlin.compiler.newInferenceEnabled=true #signingRequired=true intellijUltimateEnabled=false -intellijEnforceCommunitySdk=true \ No newline at end of file diff --git a/gradle.properties.as34 b/gradle.properties.as34 index d5407a7a888..0ebec85453a 100644 --- a/gradle.properties.as34 +++ b/gradle.properties.as34 @@ -10,4 +10,3 @@ kotlin.compiler.newInferenceEnabled=true #signingRequired=true intellijUltimateEnabled=false -intellijEnforceCommunitySdk=true \ No newline at end of file