diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingMetadataIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingMetadataIT.kt index 92daa003075..000a1e98e36 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingMetadataIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingMetadataIT.kt @@ -20,6 +20,8 @@ class KotlinToolingMetadataIT : BaseGradleIT() { @Test fun `new-mpp-published`() = with(transformProjectWithPluginsDsl("new-mpp-published")) { + projectDir.resolve("gradle.properties").appendText("\nkotlin.mpp.enableKotlinToolingMetadataArtifact=true") + build("publish") { assertSuccessful() assertTasksExecuted( @@ -89,6 +91,7 @@ class KotlinToolingMetadataIT : BaseGradleIT() { @Test fun `kotlin-js-browser-project`() = with(transformProjectWithPluginsDsl("kotlin-js-browser-project")) { + projectDir.resolve("gradle.properties").appendText("\nkotlin.mpp.enableKotlinToolingMetadataArtifact=true") build(BuildKotlinToolingMetadataTask.defaultTaskName) { assertSuccessful() assertTasksExecuted(":app:${BuildKotlinToolingMetadataTask.defaultTaskName}") diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt index ad133a29c81..0449419bff4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt @@ -11,6 +11,7 @@ package org.jetbrains.kotlin.gradle import com.android.build.gradle.BaseExtension import org.gradle.api.JavaVersion import org.gradle.api.internal.project.ProjectInternal +import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.compilerRunner.konanVersion import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension @@ -40,6 +41,10 @@ class BuildKotlinToolingMetadataTest { private val multiplatformExtension get() = project.extensions.getByType(KotlinMultiplatformExtension::class.java) private val jsExtension get() = project.extensions.getByType(KotlinJsProjectExtension::class.java) + init { + project.extensions.getByType(ExtraPropertiesExtension::class.java).set("kotlin.mpp.enableKotlinToolingMetadataArtifact", "true") + } + @Test fun `multiplatform empty setup`() { project.plugins.apply("kotlin-multiplatform") 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 bc561074fe0..abebdce7a6a 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 @@ -127,7 +127,7 @@ internal class PropertiesProvider private constructor(private val project: Proje get() = booleanProperty("kotlin.mpp.enableCompatibilityMetadataVariant") ?: true val enableKotlinToolingMetadataArtifact: Boolean - get() = booleanProperty("kotlin.mpp.enableKotlinToolingMetadataArtifact") ?: true + get() = booleanProperty("kotlin.mpp.enableKotlinToolingMetadataArtifact") ?: false val mppStabilityNoWarn: Boolean? get() = booleanProperty(KotlinMultiplatformPlugin.STABILITY_NOWARN_FLAG)