Build: replace usages of idea.fir.plugin with kotlinBuildProperties.useFirIdeaPlugin

This commit is contained in:
Dmitriy Novozhilov
2020-11-16 17:54:41 +03:00
parent 1a3727a17c
commit c625a83ab5
5 changed files with 9 additions and 12 deletions
+3 -6
View File
@@ -6,9 +6,6 @@ plugins {
} }
val kotlinVersion: String by rootProject.extra val kotlinVersion: String by rootProject.extra
val isFirPlugin: Boolean
get() = rootProject.findProperty("idea.fir.plugin") == "true"
repositories { repositories {
maven("https://jetbrains.bintray.com/markdown") maven("https://jetbrains.bintray.com/markdown")
@@ -28,7 +25,7 @@ sourceSets {
"idea-repl/resources", "idea-repl/resources",
"resources-en" "resources-en"
) )
if (isFirPlugin) { if (kotlinBuildProperties.useFirIdeaPlugin) {
resources.srcDir("resources-fir") resources.srcDir("resources-fir")
} else { } else {
resources.srcDir("resources-descriptors") resources.srcDir("resources-descriptors")
@@ -186,7 +183,7 @@ dependencies {
testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("smali"))
testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("testng"))
if (isFirPlugin) { if (kotlinBuildProperties.useFirIdeaPlugin) {
testRuntime(project(":idea:idea-fir")) testRuntime(project(":idea:idea-fir"))
} }
@@ -226,4 +223,4 @@ projectTest(parallel = true) {
configureFormInstrumentation() configureFormInstrumentation()
testsJar() testsJar()
@@ -37,7 +37,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
if (rootProject.findProperty("idea.fir.plugin") == "true") { if (kotlinBuildProperties.useFirIdeaPlugin) {
projectTest(parallel = true) { projectTest(parallel = true) {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
@@ -88,4 +88,4 @@ projectTest(taskName = "ideaFirPerformanceTest") {
systemProperty("kotlin.test.gradle.import.arguments", "-PcacheRedirectorEnabled=$it") systemProperty("kotlin.test.gradle.import.arguments", "-PcacheRedirectorEnabled=$it")
} }
} }
} }
+2 -2
View File
@@ -33,11 +33,11 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
if (rootProject.findProperty("idea.fir.plugin") == "true") { if (kotlinBuildProperties.useFirIdeaPlugin) {
projectTest(parallel = true) { projectTest(parallel = true) {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
} }
} }
testsJar() testsJar()
+1 -1
View File
@@ -41,7 +41,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
if (rootProject.findProperty("idea.fir.plugin") == "true") { if (kotlinBuildProperties.useFirIdeaPlugin) {
projectTest { projectTest {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
@@ -44,7 +44,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
if (rootProject.findProperty("idea.fir.plugin") == "true") { if (kotlinBuildProperties.useFirIdeaPlugin) {
projectTest { projectTest {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir