azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Fix test distribution plugin applying condition

Browse Source
This commit is contained in:
Alexander Likhachev
2021-03-11 18:10:20 +03:00
parent 99ce047733
commit dbfe45993a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/testDistribution.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import org.gradle.internal.os.OperatingSystem
fun Test.configureTestDistribution(configure: TestDistributionExtension.() -> Unit = {}) { 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 val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
js/js.tests/build.gradle.kts
+1 -2
View File
@@ -14,8 +14,7 @@ plugins {
} }
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
val testDistributionEnabled = project.providers.gradleProperty("kotlin.build.test.distribution.enabled") val testDistributionEnabled = project.findProperty("kotlin.build.test.distribution.enabled")?.toString()?.toBoolean()
.forUseAtConfigurationTime().orNull?.toBoolean()
?: isTeamcityBuild ?: isTeamcityBuild
if (testDistributionEnabled) { if (testDistributionEnabled) {