Deprecate 'kotlin.parallel.tasks.in.project' build property.
Default value will use Gradle parallel execution option value. ^KT-46401 Fixed
This commit is contained in:
+1
-2
@@ -1,6 +1,5 @@
|
|||||||
coroutines_version = 1.1.1
|
coroutines_version = 1.1.1
|
||||||
moowork_node = 1.2.0
|
moowork_node = 1.2.0
|
||||||
|
|
||||||
org.gradle.paralllel=true
|
org.gradle.parallel=true
|
||||||
kotlin.parallel.tasks.in.project=true
|
|
||||||
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
||||||
@@ -2,6 +2,5 @@ kotlin_version = {{kotlin_plugin_version}}
|
|||||||
coroutines_version = 1.1.1
|
coroutines_version = 1.1.1
|
||||||
moowork_node = 1.2.0
|
moowork_node = 1.2.0
|
||||||
|
|
||||||
org.gradle.paralllel=true
|
org.gradle.parallel=true
|
||||||
kotlin.parallel.tasks.in.project=true
|
|
||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
+2
-4
@@ -242,7 +242,7 @@ abstract class BaseGradleIT {
|
|||||||
val usePreciseJavaTracking: Boolean? = null,
|
val usePreciseJavaTracking: Boolean? = null,
|
||||||
val withBuildCache: Boolean = false,
|
val withBuildCache: Boolean = false,
|
||||||
val kaptOptions: KaptOptions? = null,
|
val kaptOptions: KaptOptions? = null,
|
||||||
val parallelTasksInProject: Boolean? = null,
|
val parallelTasksInProject: Boolean = false,
|
||||||
val jsCompilerType: KotlinJsCompilerType? = null,
|
val jsCompilerType: KotlinJsCompilerType? = null,
|
||||||
val configurationCache: Boolean = false,
|
val configurationCache: Boolean = false,
|
||||||
val configurationCacheProblems: ConfigurationCacheProblems = ConfigurationCacheProblems.FAIL,
|
val configurationCacheProblems: ConfigurationCacheProblems = ConfigurationCacheProblems.FAIL,
|
||||||
@@ -928,9 +928,7 @@ Finished executing task ':$taskName'|
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
options.parallelTasksInProject?.let {
|
if (options.parallelTasksInProject) add("--parallel") else add("--no-parallel")
|
||||||
add("-Pkotlin.parallel.tasks.in.project=$it")
|
|
||||||
}
|
|
||||||
|
|
||||||
options.jsCompilerType?.let {
|
options.jsCompilerType?.let {
|
||||||
add("-Pkotlin.js.compiler=$it")
|
add("-Pkotlin.js.compiler=$it")
|
||||||
|
|||||||
+1
-2
@@ -1,5 +1,4 @@
|
|||||||
#kotlin_version = 1.4.255-SNAPSHOT
|
#kotlin_version = 1.4.255-SNAPSHOT
|
||||||
#android_tools_version = 3.6.0
|
#android_tools_version = 3.6.0
|
||||||
|
|
||||||
org.gradle.paralllel=true
|
org.gradle.parallel=true
|
||||||
kotlin.parallel.tasks.in.project=true
|
|
||||||
|
|||||||
+16
-1
@@ -140,13 +140,28 @@ internal class PropertiesProvider private constructor(private val project: Proje
|
|||||||
val ignoreIncorrectNativeDependencies: Boolean?
|
val ignoreIncorrectNativeDependencies: Boolean?
|
||||||
get() = booleanProperty(KOTLIN_NATIVE_IGNORE_INCORRECT_DEPENDENCIES)
|
get() = booleanProperty(KOTLIN_NATIVE_IGNORE_INCORRECT_DEPENDENCIES)
|
||||||
|
|
||||||
|
private val parallelTasksInProjectPropName = "kotlin.parallel.tasks.in.project"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enables parallel tasks execution within a project with Workers API.
|
* Enables parallel tasks execution within a project with Workers API.
|
||||||
* Does not enable using actual worker proccesses
|
* Does not enable using actual worker proccesses
|
||||||
* (Kotlin Daemon can be shared which uses less memory)
|
* (Kotlin Daemon can be shared which uses less memory)
|
||||||
*/
|
*/
|
||||||
val parallelTasksInProject: Boolean?
|
val parallelTasksInProject: Boolean?
|
||||||
get() = booleanProperty("kotlin.parallel.tasks.in.project")
|
get() {
|
||||||
|
return if (property(parallelTasksInProjectPropName) != null) {
|
||||||
|
SingleWarningPerBuild.show(
|
||||||
|
project,
|
||||||
|
"""
|
||||||
|
Project property '$parallelTasksInProjectPropName' is deprecated.
|
||||||
|
By default it depends on Gradle parallel project execution option value.
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
booleanProperty(parallelTasksInProjectPropName)
|
||||||
|
} else {
|
||||||
|
return project.gradle.startParameter.isParallelProjectExecutionEnabled
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enables individual test task reporting for aggregated test tasks.
|
* Enables individual test task reporting for aggregated test tasks.
|
||||||
|
|||||||
Reference in New Issue
Block a user