[mpp] Remove usage of deprecated pre-HMPP properties from tests

#KT-59304 In Progress

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

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") {
+            build(":compileCommonMainKotlinMetadata") {
-                assertTasksExecuted(":compileKotlinMetadata")
+                assertTasksExecuted(":compileCommonMainKotlinMetadata")
 
-                assertCompilerArgument(":compileKotlinMetadata", "-language-version 2.0")
+                assertCompilerArgument(":compileCommonMainKotlinMetadata", "-language-version 2.0")
             }
 
             build(":compileKotlinJvm") {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/gradle.properties

@@ -1 +0,0 @@
-kotlin.mpp.enableCompatibilityMetadataVariant=true

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

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

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

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

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/gradle.properties

@@ -1 +0,0 @@
-kotlin.mpp.enableCompatibilityMetadataVariant=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/gradle.properties

@@ -1 +0,0 @@
-kotlin.mpp.enableCompatibilityMetadataVariant=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-56380_correct_nullability_inference/gradle.properties

@@ -1 +0,0 @@
-kotlin.mpp.enableCompatibilityMetadataVariant=true

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

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties

@@ -1 +0,0 @@
-kotlin.mpp.enableCompatibilityMetadataVariant=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/gradle.properties

@@ -1 +0,0 @@
-kotlin.mpp.enableCompatibilityMetadataVariant=true

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")

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()

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()
     }

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)

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)

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
     }

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()
     }

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())
 }