Move a couple ad-hoc properties to buildSrc/BuildPropertiesExt

This commit is contained in:
Ilya Gorbunov
2020-04-03 14:16:05 +03:00
parent f966ce2431
commit d115792d9a
4 changed files with 9 additions and 7 deletions
+2 -4
View File
@@ -54,9 +54,7 @@ pill {
} }
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
val includeStdlibJsIr by extra( val includeStdlibJsIr by extra(project.kotlinBuildProperties.includeStdlibJsIr)
findProperty("include.stdlib.js.ir")?.let { it.toString().toBoolean() } ?: isTeamcityBuild
)
val configuredJdks: List<JdkId> = val configuredJdks: List<JdkId> =
getConfiguredJdks().also { getConfiguredJdks().also {
@@ -327,7 +325,7 @@ fun Task.listConfigurationContents(configName: String) {
val defaultJvmTarget = "1.8" val defaultJvmTarget = "1.8"
val defaultJavaHome = jdkPath(defaultJvmTarget) val defaultJavaHome = jdkPath(defaultJvmTarget)
val ignoreTestFailures by extra(project.findProperty("ignoreTestFailures")?.toString()?.toBoolean() ?: project.hasProperty("teamcity")) val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures)
allprojects { allprojects {
@@ -15,4 +15,8 @@ val KotlinBuildProperties.relocation: Boolean get() = postProcessing
val KotlinBuildProperties.proguard: Boolean get() = postProcessing && getBoolean("kotlin.build.proguard", isTeamcityBuild) val KotlinBuildProperties.proguard: Boolean get() = postProcessing && getBoolean("kotlin.build.proguard", isTeamcityBuild)
val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild) val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild)
val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild)
val KotlinBuildProperties.includeStdlibJsIr: Boolean get() = getBoolean("include.stdlib.js.ir", isTeamcityBuild)
+1 -1
View File
@@ -172,7 +172,7 @@ val runMocha by task<NpmTask> {
val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test" val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test"
setArgs(listOf("run", target)) setArgs(listOf("run", target))
setIgnoreExitValue(rootProject.getBooleanProperty("ignoreTestFailures") ?: false) setIgnoreExitValue(kotlinBuildProperties.ignoreTestFailures)
dependsOn(npmInstall, "test") dependsOn(npmInstall, "test")
+1 -1
View File
@@ -350,7 +350,7 @@ val runMocha by task<NodeTask> {
val allArgs = getArgs().toList() + listOf(testOutputFile/*, kotlinTestTestOutputFile*/) val allArgs = getArgs().toList() + listOf(testOutputFile/*, kotlinTestTestOutputFile*/)
setArgs(allArgs) setArgs(allArgs)
setIgnoreExitValue(rootProject.getBooleanProperty("ignoreTestFailures") ?: false) setIgnoreExitValue(kotlinBuildProperties.ignoreTestFailures)
setWorkingDir(buildDir) setWorkingDir(buildDir)
} }