[Gradle, K/N] Increase Xmx for MPP tests with native

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt

@@ -5,6 +5,8 @@
 package org.jetbrains.kotlin.gradle
 
 import org.jetbrains.kotlin.gradle.native.MPPNativeTargets
+import org.jetbrains.kotlin.gradle.native.configureMemoryInGradleProperties
+import org.jetbrains.kotlin.gradle.native.transformNativeTestProject
 import org.jetbrains.kotlin.gradle.native.transformNativeTestProjectWithPluginDsl
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.*
@@ -397,9 +399,7 @@ class NewMultiplatformIT : BaseGradleIT() {
 
     @Test
     fun testMavenPublishAppliedBeforeMultiplatformPlugin() =
-        with(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) {
+        with(transformNativeTestProject("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) {
-            setupWorkingDir()
-
             gradleBuildScript().modify { "apply plugin: 'maven-publish'\n$it" }
 
             build {
@@ -456,6 +456,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     private fun doTestJvmWithJava(testJavaSupportInJvmTargets: Boolean) =
         with(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) {
             embedProject(Project("sample-lib-gradle-kotlin-dsl", directoryPrefix = "new-mpp-lib-and-app"))
+            configureMemoryInGradleProperties()
 
             lateinit var classesWithoutJava: Set<String>
 
@@ -613,11 +614,10 @@ class NewMultiplatformIT : BaseGradleIT() {
         }
 
     @Test
-    fun testLibWithTests() = doTestLibWithTests(Project("new-mpp-lib-with-tests", gradleVersion))
+    fun testLibWithTests() = doTestLibWithTests(transformNativeTestProject("new-mpp-lib-with-tests", gradleVersion))
 
     @Test
-    fun testLibWithTestsKotlinDsl() = with(Project("new-mpp-lib-with-tests", gradleVersion)) {
+    fun testLibWithTestsKotlinDsl() = with(transformNativeTestProject("new-mpp-lib-with-tests", gradleVersion)) {
-        setupWorkingDir()
         gradleBuildScript().delete()
         projectDir.resolve("build.gradle.kts.alternative").renameTo(projectDir.resolve("build.gradle.kts"))
         gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl)
@@ -687,9 +687,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testLanguageSettingsApplied() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
+    fun testLanguageSettingsApplied() = with(transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
-        setupWorkingDir()
-
         gradleBuildScript().appendText(
             "\n" + """
                 kotlin.sourceSets.all {
@@ -903,7 +901,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testPublishingOnlySupportedNativeTargets() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
+    fun testPublishingOnlySupportedNativeTargets() = with(transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
         val publishedVariant = nativeHostTargetName
         val nonPublishedVariant = unsupportedNativeTargets[0]
 
@@ -923,8 +921,7 @@ class NewMultiplatformIT : BaseGradleIT() {
 
     @Test
     fun testNonMppConsumersOfLibraryPublishedWithNoMetadataOptIn() {
-        val repoDir = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
+        val repoDir = with(transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
-            setupWorkingDir()
             projectDir.resolve("settings.gradle").modify { it.replace("enableFeaturePreview", "// enableFeaturePreview") }
             build(
                 "publish"
@@ -975,9 +972,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testOptionalExpectations() = with(Project("new-mpp-lib-with-tests", gradleVersion)) {
+    fun testOptionalExpectations() = with(transformNativeTestProject("new-mpp-lib-with-tests", gradleVersion)) {
-        setupWorkingDir()
-
         projectDir.resolve("src/commonMain/kotlin/Optional.kt").writeText(
             """
             @file:Suppress("EXPERIMENTAL_API_USAGE_ERROR")
@@ -1018,7 +1013,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testSourceJars() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
+    fun testSourceJars() = with(transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
         setupWorkingDir()
 
         build("publish") {
@@ -1042,12 +1037,12 @@ class NewMultiplatformIT : BaseGradleIT() {
 
     @Test
     fun testConsumeMppLibraryFromNonKotlinProject() {
-        val libRepo = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
+        val libRepo = with(transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
             build("publish") { assertSuccessful() }
             projectDir.resolve("repo")
         }
 
-        with(Project("sample-app-without-kotlin", gradleVersion, "new-mpp-lib-and-app")) {
+        with(transformNativeTestProject("sample-app-without-kotlin", gradleVersion, "new-mpp-lib-and-app")) {
             setupWorkingDir()
             gradleBuildScript().appendText("\nrepositories { maven { url '${libRepo.toURI()}' } }")
 
@@ -1061,10 +1056,10 @@ class NewMultiplatformIT : BaseGradleIT() {
 
     @Test
     fun testPublishMultimoduleProjectWithMetadata() {
-        val libProject = Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")
+        val libProject = transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")
         libProject.setupWorkingDir()
 
-        Project("sample-external-lib", gradleVersion, "new-mpp-lib-and-app").apply {
+        transformNativeTestProject("sample-external-lib", gradleVersion, "new-mpp-lib-and-app").apply {
             setupWorkingDir()
             // Publish it into local repository of adjacent lib:
             gradleBuildScript().appendText(
@@ -1081,7 +1076,7 @@ class NewMultiplatformIT : BaseGradleIT() {
             }
         }
 
-        val appProject = Project("sample-app", gradleVersion, "new-mpp-lib-and-app")
+        val appProject = transformNativeTestProject("sample-app", gradleVersion, "new-mpp-lib-and-app")
 
         with(libProject) {
             setupWorkingDir()
@@ -1196,9 +1191,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testMppBuildWithCompilerPlugins() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
+    fun testMppBuildWithCompilerPlugins() = with(transformNativeTestProject("sample-lib", gradleVersion, "new-mpp-lib-and-app")) {
-        setupWorkingDir()
-
         val printOptionsTaskName = "printCompilerPluginOptions"
         val argsMarker = "=args=>"
         val classpathMarker = "=cp=>"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt

@@ -47,15 +47,15 @@ internal object MPPNativeTargets {
     val supported = listOf("linux64", "macos64", "mingw64").filter { !unsupported.contains(it) }
 }
 
-private fun BaseGradleIT.transformNativeTestProject(projectName: String, directoryPrefix: String? = null): BaseGradleIT.Project {
+internal fun BaseGradleIT.transformNativeTestProject(projectName: String, wrapperVersion: GradleVersionRequired = defaultGradleVersion, directoryPrefix: String? = null): BaseGradleIT.Project {
-    val project = Project(projectName, directoryPrefix = directoryPrefix)
+    val project = Project(projectName, wrapperVersion, directoryPrefix = directoryPrefix)
     project.setupWorkingDir()
     project.configureSingleNativeTarget()
     project.configureMemoryInGradleProperties()
     return project
 }
 
-fun BaseGradleIT.transformNativeTestProjectWithPluginDsl(projectName: String, wrapperVersion: GradleVersionRequired = defaultGradleVersion, directoryPrefix: String? = null): BaseGradleIT.Project {
+internal fun BaseGradleIT.transformNativeTestProjectWithPluginDsl(projectName: String, wrapperVersion: GradleVersionRequired = defaultGradleVersion, directoryPrefix: String? = null): BaseGradleIT.Project {
     val project = transformProjectWithPluginsDsl(projectName, wrapperVersion, directoryPrefix = directoryPrefix)
     project.configureSingleNativeTarget()
     project.configureMemoryInGradleProperties()
@@ -63,14 +63,11 @@ fun BaseGradleIT.transformNativeTestProjectWithPluginDsl(projectName: String, wr
 }
 
 internal fun BaseGradleIT.Project.configureMemoryInGradleProperties() {
-    val files = projectDir.walk()
+    val file = projectDir.resolve("gradle.properties")
-        .filter { it.isFile && (it.name == "gradle.properties") }.toMutableList()
+    if (file.exists()) {
-    if (files.isEmpty()) {
+        file.createNewFile()
-        files.add(projectDir.resolve("gradle.properties").also { it.createNewFile() })
-    }
-    files.forEach { file ->
-        file.appendText("\norg.gradle.jvmargs=-Xmx1g\n")
     }
+    file.appendText("\norg.gradle.jvmargs=-Xmx1g\n")
 }
 
 private const val SINGLE_NATIVE_TARGET_PLACEHOLDER = "<SingleNativeTarget>"