From dbfe45993afc90946e35ecca58dbafde9199e456 Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Thu, 11 Mar 2021 18:10:20 +0300
Subject: [PATCH] [Build] Fix test distribution plugin applying condition

---
 buildSrc/src/main/kotlin/testDistribution.kt | 2 +-
 js/js.tests/build.gradle.kts                 | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testDistribution.kt b/buildSrc/src/main/kotlin/testDistribution.kt
index b796707ba16..a64067a74cb 100644
--- a/buildSrc/src/main/kotlin/testDistribution.kt
+++ b/buildSrc/src/main/kotlin/testDistribution.kt
@@ -9,7 +9,7 @@ import org.gradle.internal.os.OperatingSystem
 
 
 fun Test.configureTestDistribution(configure: TestDistributionExtension.() -> Unit = {}) {
-    if(extensions.findByType(TestDistributionExtension::class.java) == null) return
+    if (extensions.findByType(TestDistributionExtension::class.java) == null) return
 
     val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
 
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 7eb842ba64e..0bb7d31eff3 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -14,8 +14,7 @@ plugins {
 }
 
 val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
-val testDistributionEnabled = project.providers.gradleProperty("kotlin.build.test.distribution.enabled")
-    .forUseAtConfigurationTime().orNull?.toBoolean()
+val testDistributionEnabled = project.findProperty("kotlin.build.test.distribution.enabled")?.toString()?.toBoolean()
     ?: isTeamcityBuild
 
 if (testDistributionEnabled) {