diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt index 3630a80694f..d4ad4c77f7d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt @@ -129,13 +129,11 @@ internal class CompilerOptionsIT : KGPBaseTest() { """ | |kotlin.options.suppressFreeCompilerArgsModificationWarning=true - |# to enable the :compileKotlinMetadata task - |kotlin.mpp.enableCompatibilityMetadataVariant=true """.trimMargin() ) val compileTasks = listOf( - "compileKotlinMetadata", + "compileCommonMainKotlinMetadata", "compileKotlinJvmWithoutJava", "compileKotlinJs", // we do not allow modifying free args for K/N at execution time diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt index 7c3a9314e31..f3b558e10dd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt @@ -137,10 +137,10 @@ class TryK2IT : KGPBaseTest() { ) { enableTryK2() - build(":compileKotlinMetadata") { - assertTasksExecuted(":compileKotlinMetadata") + build(":compileCommonMainKotlinMetadata") { + assertTasksExecuted(":compileCommonMainKotlinMetadata") - assertCompilerArgument(":compileKotlinMetadata", "-language-version 2.0") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-language-version 2.0") } build(":compileKotlinJvm") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/gradle.properties deleted file mode 100755 index a8518e0d1ea..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties index f09c3da7a0e..b833f78a173 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties @@ -1,3 +1,2 @@ kotlin.mpp.enableCInteropCommonization=true kotlin.mpp.enableIntransitiveMetadataConfiguration=true -kotlin.mpp.enableCompatibilityMetadataVariant=false \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/gradle.properties index 43daa44e3b8..b833f78a173 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/gradle.properties @@ -1,3 +1,2 @@ kotlin.mpp.enableCInteropCommonization=true -kotlin.mpp.enableCompatibilityMetadataVariant=false kotlin.mpp.enableIntransitiveMetadataConfiguration=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/gradle.properties index 43daa44e3b8..b833f78a173 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/gradle.properties @@ -1,3 +1,2 @@ kotlin.mpp.enableCInteropCommonization=true -kotlin.mpp.enableCompatibilityMetadataVariant=false kotlin.mpp.enableIntransitiveMetadataConfiguration=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/gradle.properties index a41af1b8318..47309cda557 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/gradle.properties @@ -1,4 +1,3 @@ kotlin.code.style=official kotlin.mpp.enableCInteropCommonization=true kotlin.mpp.enableIntransitiveMetadataConfiguration=true -kotlin.mpp.enableCompatibilityMetadataVariant=false diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/gradle.properties deleted file mode 100644 index a8518e0d1ea..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/gradle.properties deleted file mode 100644 index 54a44d0a588..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-56380_correct_nullability_inference/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-56380_correct_nullability_inference/gradle.properties deleted file mode 100644 index a8518e0d1ea..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-56380_correct_nullability_inference/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/gradle.properties index a1f906e0a60..2db016ae4e4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/gradle.properties @@ -1,3 +1 @@ -kotlin.mpp.enableGranularSourceSetsMetadata=true -kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableCInteropCommonization=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties deleted file mode 100644 index 54a44d0a588..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/gradle.properties deleted file mode 100644 index a8518e0d1ea..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt index 637627b4555..ad7884c5963 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt @@ -31,7 +31,6 @@ class JvmAndAndroidIntermediateSourceSetTest { fun setup() { project = ProjectBuilder.builder().build() as ProjectInternal addBuildEventsListenerRegistryMock(project) - project.extensions.getByType(ExtraPropertiesExtension::class.java).set("kotlin.mpp.enableGranularSourceSetsMetadata", "true") project.plugins.apply("kotlin-multiplatform") project.plugins.apply("android-library") diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt index b7e1486d4ae..0699ffed972 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt @@ -13,11 +13,6 @@ import kotlin.test.Test class KT46273JvmTargetAndOrphanTestSourceSetTest : MultiplatformExtensionTest() { - override fun setup() { - enableGranularSourceSetsMetadata() - super.setup() - } - @Test fun `test KT-46273`() { kotlin.jvm() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt index 495ef7c8083..20e369973fe 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt @@ -32,7 +32,6 @@ class CInteropCommonizerTaskTest : MultiplatformExtensionTest() { @BeforeTest override fun setup() { - enableGranularSourceSetsMetadata() enableCInteropCommonization() super.setup() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt index bbd02fab377..7366f80dd32 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt @@ -25,7 +25,6 @@ internal class CompilationSpecificPluginPath { class NativeSpecificPlugin : FakeSubPlugin("common", "native", { true }) val project = buildProject { - extensions.getByType(ExtraPropertiesExtension::class.java).set("kotlin.mpp.enableGranularSourceSetsMetadata", "true") project.plugins.apply("kotlin-multiplatform") plugins.apply(NativeSpecificPlugin::class.java) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt index 7ca420c66a3..af2ff68e04e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.gradle.plugin.diagnostics.kotlinToolingDiagnosticsCo import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin import org.jetbrains.kotlin.gradle.util.enableCInteropCommonization -import org.jetbrains.kotlin.gradle.util.enableHierarchicalStructureByDefault import org.jetbrains.kotlin.gradle.util.propertiesExtension import kotlin.test.* @@ -79,18 +78,6 @@ class DisabledCInteropCommonizationWarningTest { ) } - @Test - fun `test warning is not shown when hierarchical structure is disabled`() { - project.enableCInteropCommonization(false) - project.enableHierarchicalStructureByDefault(false) - project.setupNativeTargetsWithCInterops() - project.evaluate() - assertNull( - project.getWarningMessage(), - "Expected no error message shown when hmpp is disabled" - ) - } - @Test fun `test warning is not shown when no cinterops are defined`() { project.enableCInteropCommonization(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt index 58bed7c5f7d..2f3f23ec0e6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt @@ -34,7 +34,6 @@ class SourceSetCommonizerTargetTest { fun setup() { project = buildProject() addBuildEventsListenerRegistryMock(project) - project.extensions.getByType(ExtraPropertiesExtension::class.java).set("kotlin.mpp.enableCompatibilityMetadataVariant", "false") project.plugins.apply("kotlin-multiplatform") kotlin = project.extensions.getByName("kotlin") as KotlinMultiplatformExtension } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/MultiplatformExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/MultiplatformExtensionTest.kt index 2fd92fd2765..41ba2fb185c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/MultiplatformExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/MultiplatformExtensionTest.kt @@ -33,10 +33,6 @@ abstract class MultiplatformExtensionTest { kotlin = project.applyMultiplatformPlugin() } - protected fun enableGranularSourceSetsMetadata() { - project.enableGranularSourceSetsMetadata() - } - protected fun enableCInteropCommonization() { project.enableCInteropCommonization() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt index fae5e78fd5a..4f3cc589c1f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt @@ -112,18 +112,10 @@ fun Project.applyCocoapodsPlugin(): CocoapodsExtension { val Project.propertiesExtension: ExtraPropertiesExtension get() = extensions.getByType(ExtraPropertiesExtension::class.java) -fun Project.enableGranularSourceSetsMetadata() { - propertiesExtension.set("kotlin.mpp.enableGranularSourceSetsMetadata", "true") -} - fun Project.enableCInteropCommonization(enabled: Boolean = true) { propertiesExtension.set(PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_CINTEROP_COMMONIZATION, enabled.toString()) } -fun Project.enableHierarchicalStructureByDefault(enabled: Boolean = true) { - propertiesExtension.set(PropertiesProvider.PropertyNames.KOTLIN_MPP_HIERARCHICAL_STRUCTURE_BY_DEFAULT, enabled.toString()) -} - fun Project.enableIntransitiveMetadataConfiguration(enabled: Boolean = true) { propertiesExtension.set(KOTLIN_MPP_ENABLE_INTRANSITIVE_METADATA_CONFIGURATION, enabled.toString()) }