From 7fc23a1647696eb48af675c3cdcd6c3d9145c149 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Tue, 11 May 2021 11:39:56 +0200
Subject: [PATCH] Deprecate 'kotlin.parallel.tasks.in.project' build property.

Default value will use Gradle parallel execution option value.

^KT-46401 Fixed
---
 .../jvmWithJavaOnHMPP/gradle.properties         |  3 +--
 .../jvmWithJava/gradle.properties               |  3 +--
 .../org/jetbrains/kotlin/gradle/BaseGradleIT.kt |  6 ++----
 .../mppJvmWithJava/gradle.properties            |  3 +--
 .../kotlin/gradle/plugin/KotlinProperties.kt    | 17 ++++++++++++++++-
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties b/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties
index 93096d79fd0..779f7fcd49c 100644
--- a/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties
+++ b/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties
@@ -1,6 +1,5 @@
 coroutines_version = 1.1.1
 moowork_node = 1.2.0
 
-org.gradle.paralllel=true
-kotlin.parallel.tasks.in.project=true
+org.gradle.parallel=true
 kotlin.mpp.enableGranularSourceSetsMetadata=true
\ No newline at end of file
diff --git a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/gradle.properties b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/gradle.properties
index eeb78e4ac9d..3ba67c25ab8 100644
--- a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/gradle.properties
+++ b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/gradle.properties
@@ -2,6 +2,5 @@ kotlin_version = {{kotlin_plugin_version}}
 coroutines_version = 1.1.1
 moowork_node = 1.2.0
 
-org.gradle.paralllel=true
-kotlin.parallel.tasks.in.project=true
+org.gradle.parallel=true
 kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index 4c5e4fd319c..c2838721e1f 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -242,7 +242,7 @@ abstract class BaseGradleIT {
         val usePreciseJavaTracking: Boolean? = null,
         val withBuildCache: Boolean = false,
         val kaptOptions: KaptOptions? = null,
-        val parallelTasksInProject: Boolean? = null,
+        val parallelTasksInProject: Boolean = false,
         val jsCompilerType: KotlinJsCompilerType? = null,
         val configurationCache: Boolean = false,
         val configurationCacheProblems: ConfigurationCacheProblems = ConfigurationCacheProblems.FAIL,
@@ -928,9 +928,7 @@ Finished executing task ':$taskName'|
                 }
             }
 
-            options.parallelTasksInProject?.let {
-                add("-Pkotlin.parallel.tasks.in.project=$it")
-            }
+            if (options.parallelTasksInProject) add("--parallel") else add("--no-parallel")
 
             options.jsCompilerType?.let {
                 add("-Pkotlin.js.compiler=$it")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/gradle.properties
index 85919925127..39cc6b946b1 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/gradle.properties
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/gradle.properties
@@ -1,5 +1,4 @@
 #kotlin_version = 1.4.255-SNAPSHOT
 #android_tools_version = 3.6.0
 
-org.gradle.paralllel=true
-kotlin.parallel.tasks.in.project=true
+org.gradle.parallel=true
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
index b77d492c577..51d16492aa2 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
@@ -140,13 +140,28 @@ internal class PropertiesProvider private constructor(private val project: Proje
     val ignoreIncorrectNativeDependencies: Boolean?
         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.
      * Does not enable using actual worker proccesses
      * (Kotlin Daemon can be shared which uses less memory)
      */
     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.