Move a couple ad-hoc properties to buildSrc/BuildPropertiesExt
This commit is contained in:
+2
-4
@@ -54,9 +54,7 @@ pill {
|
||||
}
|
||||
|
||||
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
|
||||
val includeStdlibJsIr by extra(
|
||||
findProperty("include.stdlib.js.ir")?.let { it.toString().toBoolean() } ?: isTeamcityBuild
|
||||
)
|
||||
val includeStdlibJsIr by extra(project.kotlinBuildProperties.includeStdlibJsIr)
|
||||
|
||||
val configuredJdks: List<JdkId> =
|
||||
getConfiguredJdks().also {
|
||||
@@ -327,7 +325,7 @@ fun Task.listConfigurationContents(configName: String) {
|
||||
|
||||
val defaultJvmTarget = "1.8"
|
||||
val defaultJavaHome = jdkPath(defaultJvmTarget)
|
||||
val ignoreTestFailures by extra(project.findProperty("ignoreTestFailures")?.toString()?.toBoolean() ?: project.hasProperty("teamcity"))
|
||||
val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures)
|
||||
|
||||
allprojects {
|
||||
|
||||
|
||||
@@ -15,4 +15,8 @@ val KotlinBuildProperties.relocation: Boolean get() = postProcessing
|
||||
|
||||
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)
|
||||
@@ -172,7 +172,7 @@ val runMocha by task<NpmTask> {
|
||||
val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test"
|
||||
setArgs(listOf("run", target))
|
||||
|
||||
setIgnoreExitValue(rootProject.getBooleanProperty("ignoreTestFailures") ?: false)
|
||||
setIgnoreExitValue(kotlinBuildProperties.ignoreTestFailures)
|
||||
|
||||
dependsOn(npmInstall, "test")
|
||||
|
||||
|
||||
@@ -350,7 +350,7 @@ val runMocha by task<NodeTask> {
|
||||
val allArgs = getArgs().toList() + listOf(testOutputFile/*, kotlinTestTestOutputFile*/)
|
||||
setArgs(allArgs)
|
||||
|
||||
setIgnoreExitValue(rootProject.getBooleanProperty("ignoreTestFailures") ?: false)
|
||||
setIgnoreExitValue(kotlinBuildProperties.ignoreTestFailures)
|
||||
setWorkingDir(buildDir)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user