clean up unused flag
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 100c788..b986026 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
@@ -520,7 +520,7 @@ } } - @GradleLinuxTest + @GradleTestWithOsCondition fun testNamespaceDSLInsteadOfPackageAttributeInManifest() { val project = Project("AndroidExtensionsProjectAGP7") val options = defaultBuildOptions().copy(incremental = false) @@ -869,8 +869,7 @@ override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = androidGradlePluginVersion, - stopDaemons = false + androidGradlePluginVersion = androidGradlePluginVersion ) @GradleTestWithOsCondition
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 e656d6c..c73b462 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
@@ -155,12 +155,11 @@ fun prepareWrapper( version: String, environmentVariables: Map<String, String> = mapOf(), - withDaemon: Boolean = true, - stopDaemons: Boolean = true + withDaemon: Boolean = true ): File { val wrapper = gradleWrappers.getOrPut(version) { createNewWrapperDir(version) } - if (withDaemon && stopDaemons) { + if (withDaemon) { DaemonRegistry.register(version) if (DaemonRegistry.activeDaemons.size > MAX_ACTIVE_GRADLE_PROCESSES) { @@ -270,7 +269,6 @@ val hierarchicalMPPStructureSupport: Boolean? = null, val enableCompatibilityMetadataVariant: Boolean? = null, val withReports: List<BuildReportType> = emptyList(), - val stopDaemons: Boolean = true, ) enum class ConfigurationCacheProblems { @@ -430,7 +428,7 @@ val wrapperVersion = chooseWrapperVersionOrFinishTest() val env = createEnvironmentVariablesMap(options) - val wrapperDir = prepareWrapper(wrapperVersion, env, stopDaemons = options.stopDaemons) + val wrapperDir = prepareWrapper(wrapperVersion, env) val cmd = createBuildCommand(wrapperDir, params, options)