From c625a83ab5d999477b70bf74e2ec80f530aa99e9 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 16 Nov 2020 17:54:41 +0300
Subject: [PATCH] Build: replace usages of `idea.fir.plugin` with
 `kotlinBuildProperties.useFirIdeaPlugin`

---
 idea/build.gradle.kts                                    | 9 +++------
 idea/idea-fir-performance-tests/build.gradle.kts         | 4 ++--
 idea/idea-fir/build.gradle.kts                           | 4 ++--
 idea/idea-frontend-fir/build.gradle.kts                  | 2 +-
 .../idea-fir-low-level-api/build.gradle.kts              | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index dd58dafdb0f..f86fdd2e425 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -6,9 +6,6 @@ plugins {
 }
 
 val kotlinVersion: String by rootProject.extra
-val isFirPlugin: Boolean
-    get() = rootProject.findProperty("idea.fir.plugin") == "true"
-
 
 repositories {
     maven("https://jetbrains.bintray.com/markdown")
@@ -28,7 +25,7 @@ sourceSets {
             "idea-repl/resources",
             "resources-en"
         )
-        if (isFirPlugin) {
+        if (kotlinBuildProperties.useFirIdeaPlugin) {
             resources.srcDir("resources-fir")
         } else {
             resources.srcDir("resources-descriptors")
@@ -186,7 +183,7 @@ dependencies {
     testRuntime(intellijPluginDep("smali"))
     testRuntime(intellijPluginDep("testng"))
 
-    if (isFirPlugin) {
+    if (kotlinBuildProperties.useFirIdeaPlugin) {
         testRuntime(project(":idea:idea-fir"))
     }
 
@@ -226,4 +223,4 @@ projectTest(parallel = true) {
 
 configureFormInstrumentation()
 
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/idea/idea-fir-performance-tests/build.gradle.kts b/idea/idea-fir-performance-tests/build.gradle.kts
index e335a16a91f..5e390461d87 100644
--- a/idea/idea-fir-performance-tests/build.gradle.kts
+++ b/idea/idea-fir-performance-tests/build.gradle.kts
@@ -37,7 +37,7 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true") {
+if (kotlinBuildProperties.useFirIdeaPlugin) {
     projectTest(parallel = true) {
         dependsOn(":dist")
         workingDir = rootDir
@@ -88,4 +88,4 @@ projectTest(taskName = "ideaFirPerformanceTest") {
             systemProperty("kotlin.test.gradle.import.arguments", "-PcacheRedirectorEnabled=$it")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts
index 7b49989dfa5..40925a12564 100644
--- a/idea/idea-fir/build.gradle.kts
+++ b/idea/idea-fir/build.gradle.kts
@@ -33,11 +33,11 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true") {
+if (kotlinBuildProperties.useFirIdeaPlugin) {
     projectTest(parallel = true) {
         dependsOn(":dist")
         workingDir = rootDir
     }
 }
 
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts
index 25a963f34f5..fc1a1dbdfe5 100644
--- a/idea/idea-frontend-fir/build.gradle.kts
+++ b/idea/idea-frontend-fir/build.gradle.kts
@@ -41,7 +41,7 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true")  {
+if (kotlinBuildProperties.useFirIdeaPlugin)  {
     projectTest {
         dependsOn(":dist")
         workingDir = rootDir
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
index 1e39279bab6..1afaef59769 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
@@ -44,7 +44,7 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-if (rootProject.findProperty("idea.fir.plugin") == "true") {
+if (kotlinBuildProperties.useFirIdeaPlugin) {
     projectTest {
         dependsOn(":dist")
         workingDir = rootDir