Apply default pluginManagement in settings for old test setup.

Cleanup non-required configuration in test projects settings.

^KT-45745 In Progress

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

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.testbase.extractJavaCompiledSources
 import org.jetbrains.kotlin.gradle.testbase.extractKotlinCompiledSources
 import org.jetbrains.kotlin.gradle.testbase.prettyPrintXml
 import org.jetbrains.kotlin.gradle.testbase.readAndCleanupTestResults
+import org.jetbrains.kotlin.gradle.testbase.addPluginManagementToSettings
 import org.jetbrains.kotlin.gradle.util.*
 import org.jetbrains.kotlin.gradle.util.modify
 import org.jetbrains.kotlin.test.RunnerWithMuteInDatabase
@@ -298,7 +299,10 @@ abstract class BaseGradleIT {
                     addHeapDumpOptionsToPropertiesFile()
                 }
 
-                if (enableCacheRedirector) projectDir.toPath().enableCacheRedirector()
+                projectDir.toPath().apply {
+                    addPluginManagementToSettings()
+                    if (enableCacheRedirector) enableCacheRedirector()
+                }
             }
         }
 

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

@@ -589,9 +589,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean)
     )
     fun testNewKotlinJsPlugin(gradleVersion: GradleVersion) {
         project("kotlin-js-plugin-project", gradleVersion) {
-            buildGradleKts.modify(::transformBuildScriptWithPluginsDsl)
-            settingsGradle.modify(::transformBuildScriptWithPluginsDsl)
-
             build("publish", "runDceKotlin", "test", "runDceBenchmarkKotlin") {
                 assertTasksExecuted(
                     ":compileKotlinJs", ":compileTestKotlinJs", ":compileBenchmarkKotlinJs",

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

@@ -24,6 +24,8 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
             id "org.jetbrains.kotlin.android" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.js" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.multiplatform" version "${'$'}kotlin_version"
+            id "org.jetbrains.kotlin.multiplatform.pm20" version "${'$'}kotlin_version"
+            id "org.jetbrains.kotlin.plugin.allopen" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.test.fixes.android" version "${'$'}kotlin_version"
         }
         
@@ -44,6 +46,8 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
                     case "kotlin-dce-js":
                         useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")        
                         break
+                    case "kotlin2js":
+                        useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
                 }
             }
         }
@@ -69,6 +73,8 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
             id("org.jetbrains.kotlin.android") version kotlin_version
             id("org.jetbrains.kotlin.js") version kotlin_version
             id("org.jetbrains.kotlin.multiplatform") version kotlin_version
+            id("org.jetbrains.kotlin.multiplatform.pm20") version kotlin_version
+            id("org.jetbrains.kotlin.plugin.allopen") version kotlin_version
             id("org.jetbrains.kotlin.test.fixes.android") version kotlin_version
         }
         
@@ -84,7 +90,8 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
                     "com.android.lint",
                     "com.android.instantapp",
                     "com.android.feature" -> useModule("com.android.tools.build:gradle:${'$'}android_tools_version")
-                    "kotlin-dce-js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")        
+                    "kotlin-dce-js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
+                    "kotlin2js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
                 }
             }
         }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/settings.gradle

@@ -1,24 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
-        id "org.jetbrains.kotlin.android" version "$kotlin_version"
-    }
-
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id.startsWith("com.android.")) {
-                useModule("com.android.tools.build:gradle:$android_tools_version")
-            }
-        }
-    }
-}
-
 include ':Android', ':Lib', ':Test'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/settings.gradle.kts

@@ -1,13 +1 @@
-pluginManagement {
+include(":shared")
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-        mavenCentral()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-include(":shared")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/associatedDependencies/settings.gradle

@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts

@@ -1,11 +1 @@
 rootProject.name = "sample-app"
-
-enableFeaturePreview("GRADLE_METADATA")
-
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/settings.gradle

@@ -1 +0,0 @@
-enableFeaturePreview('GRADLE_METADATA')

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts

@@ -1,11 +1 @@
 rootProject.name = "sample-lib"
-
-enableFeaturePreview("GRADLE_METADATA")
-
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/settings.gradle

@@ -1 +0,0 @@
-enableFeaturePreview('GRADLE_METADATA')

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/settings.gradle.kts

@@ -1,15 +1,3 @@
-pluginManagement {
-    val kotlin_version: String? by settings
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        kotlin("multiplatform") version (kotlin_version ?: "1.6.255-SNAPSHOT")
-    }
-}
-
 rootProject.name = "kotlin-multiplatform-projects"
 include(":p1")
 include(":p2")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-failing/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

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

@@ -1,6 +0,0 @@
-pluginManagement {
-	repositories {
-		mavenLocal()
-		gradlePluginPortal()
-	}
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46142-singleNativeTarget/settings.gradle.kts

@@ -1,12 +1 @@
-pluginManagement {
+include(":p1")
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-include(":p1")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46234-singleNativeTarget/settings.gradle.kts

@@ -1,12 +1 @@
-pluginManagement {
+include(":p1")
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-include(":p1")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/settings.gradle.kts

@@ -1,12 +1 @@
-pluginManagement {
+include(":p1")
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-include(":p1")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47641-cinterops-compilation-dependency/settings.gradle.kts

@@ -1,14 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 include(":p0")
 include(":p1")
 include(":p2")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48856-singleNativeTargetPropagation-testSourceSet/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/settings.gradle.kts

@@ -1,12 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/settings.gradle.kts

@@ -1,12 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 include(":p1")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/settings.gradle.kts

@@ -1,14 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 include(":p1")
 include(":p2")
 include(":p3")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyPlatformDependencies/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/settings.gradle.kts

@@ -1,12 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeMultipleCInteropsWithTests/settings.gradle.kts

@@ -1,12 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeNativeDistributionWithIosLinuxWindows/settings.gradle.kts

@@ -1,13 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 include(":p1")
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/settings.gradle.kts

@@ -1,12 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/settings.gradle.kts

@@ -1,12 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/both/settings.gradle.kts

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-ext/settings.gradle

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-root/settings.gradle

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-ext/settings.gradle.kts

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-root/settings.gradle.kts

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/without-generate-externals/settings.gradle.kts

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-all-native/settings.gradle.kts

@@ -1,12 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-    	kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 rootProject.name = "my-lib-foo"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/settings.gradle.kts

@@ -1,12 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-    	kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 rootProject.name = "my-lib-foo"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/settings.gradle

@@ -1,9 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
 rootProject.name = 'multimod-hmpp'
 include ':top-mpp', ':bottom-mpp', ':mpp-additional', ':api-jvm', ':plain-jvm'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-project-dependency/settings.gradle.kts

@@ -1,12 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "mpp-granular-metadata-demo"
 
 include("my-lib-foo", "my-lib-bar", "my-app")
-
-enableFeaturePreview("GRADLE_METADATA")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/settings.gradle.kts

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "my-app"
-
-enableFeaturePreview("GRADLE_METADATA")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/settings.gradle.kts

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "my-lib-bar"
-
-enableFeaturePreview("GRADLE_METADATA")

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

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "my-lib-foo"
-
-enableFeaturePreview("GRADLE_METADATA")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/settings.gradle.kts

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "third-party-lib"
-
-enableFeaturePreview("GRADLE_METADATA")

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

@@ -1,12 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "hierarchical-mpp-with-js"
-
 include("my-lib-foo", "my-app")
-
-enableFeaturePreview("GRADLE_METADATA")

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

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "my-lib-foo"
-
-enableFeaturePreview("GRADLE_METADATA")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/settings.gradle.kts

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "third-party-lib"
-
-enableFeaturePreview("GRADLE_METADATA")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecution/settings.gradle

@@ -6,4 +6,4 @@ dependencyResolutionManagement {
     }
 }
 
-include ':main-project', ':lib-project'
+include ':main-project', ':lib-project'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/settings.gradle

@@ -1,8 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 includeBuild("lib")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir/settings.gradle.kts

@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id("org.jetbrains.kotlin.multiplatform") version "${extra["kotlin_version"]}"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable-browser-nodejs/settings.gradle.kts

@@ -1,8 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "js-library"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable/settings.gradle.kts

@@ -1,8 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "js-library"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/jvm-and-js-hmpp/settings.gradle.kts

@@ -1,10 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "third-party-lib"
-
-enableFeaturePreview("GRADLE_METADATA")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/settings.gradle

@@ -1,12 +0,0 @@
-pluginManagement {
-    // Required for KaptModeIT. Remove it once these tests will be migrated.
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/settings.gradle

@@ -1,12 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/mppJvmWithJava/settings.gradle

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/settings.gradle

@@ -1,10 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "kotlin-js-browser"
 
 include("base")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("js").version("<pluginMarkerVersion>")
+    kotlin("js")
     id("kotlin-dce-js")
     `maven-publish`
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/settings.gradle

@@ -1,15 +1 @@
-pluginManagement {
-    resolutionStrategy {
-        eachPlugin{
-            if (requested.id.id == "kotlin-dce-js") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:<pluginMarkerVersion>")
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "kotlin-js-plugin"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-mpp-classpathMode/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts

@@ -1,7 +0,0 @@
-
-pluginManagement {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinProject/settings.gradle

@@ -1,15 +0,0 @@
-// Required to be here until all tests using this project will migrate
-// to new DSL
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-        id "org.jetbrains.kotlin.plugin.allopen" version "$kotlin_version"
-        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/settings.gradle.kts

@@ -1,23 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        google()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    val android_tools_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-        kotlin("android").version(kotlin_version)
-    }
-
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id.startsWith("com.android")) {
-                useModule("com.android.tools.build:gradle:$android_tools_version")
-            }
-        }
-    }
-}
-
 rootProject.name = "project"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/settings.gradle.kts

@@ -1,13 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    plugins {
-        val kotlin_version: String by settings
-        kotlin("multiplatform.pm20").version(kotlin_version)
-    }
-}
-
 rootProject.name = "kpmTransientPluginOptions"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/settings.gradle

@@ -1,18 +1 @@
-pluginManagement {
+include(":mpp-lib", ":jvm-app", ":js-app")
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlin2js") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
-include(":mpp-lib", ":jvm-app", ":js-app")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/settings.gradle

@@ -1,3 +1 @@
-enableFeaturePreview('GRADLE_METADATA')
-
 include(":mpp-lib", ":jvm-app")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-46417-ios-test-source-sets/settings.gradle.kts

@@ -1,14 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}
-
 include(":p1")
 include(":p2")
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-single-jvm-target/settings.gradle.kts

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    val kotlin_version: String by settings
-    plugins {
-        kotlin("multiplatform").version(kotlin_version)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/settings.gradle

@@ -1,32 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
-        id "org.jetbrains.kotlin.android" version "$kotlin_version"
-        id "org.jetbrains.kotlin.js" version "$kotlin_version"
-        id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    }
-
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "com.android.application" ||
-                    requested.id.id == "com.android.library" ||
-                    requested.id.id == "com.android.test" ||
-                    requested.id.id == "com.android.dynamic-feature" ||
-                    requested.id.id == "com.android.asset-pack" ||
-                    requested.id.id == "com.android.asset-pack-bundle" ||
-                    requested.id.id == "com.android.lint" ||
-                    requested.id.id == "com.android.instantapp" ||
-                    requested.id.id == "com.android.feature") {
-                useModule("com.android.tools.build:gradle:$android_tools_version")
-            }
-        }
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts

@@ -1,12 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview("GRADLE_METADATA")
-
 include(":app")
 include(":lib")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/settings.gradle.kts

@@ -1,12 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview("GRADLE_METADATA")
-
 include(":app")
 include(":lib")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/settings.gradle.kts

@@ -1,12 +1,2 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview("GRADLE_METADATA")
-
 include(":app")
 include(":lib")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/executables/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-binary"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/settings.gradle

@@ -1,13 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-framework"
 
 include ':exported'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/groovy-dsl/settings.gradle

@@ -1,5 +1,3 @@
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-binary"
 
 include ':exported'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/kotlin-dsl/settings.gradle

@@ -1,13 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-binary"
 
 include ':exported'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/settings.gradle

@@ -1,13 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-library"
 
 include ':exported'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cinterop/settings.gradle

@@ -1,13 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-cinterop"
 
 include 'projectLibrary'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-commonization/settings.gradle

@@ -1,9 +1 @@
-pluginManagement {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}
-
 rootProject.name = "cocoapods"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/settings.gradle

@@ -1,13 +1,3 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 // We move the actual library in a subproject to test accessing gradle wrapper from Xcode.
 rootProject.name = "cocoapods"
 include 'kotlin-library'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/settings.gradle

@@ -1,13 +1,3 @@
-pluginManagement {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 // We move the actual library in a subproject to test accessing gradle wrapper from Xcode.
 rootProject.name = "cocoapods"
 include 'kotlin-library'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "cocoapods"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "cocoapods"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-tests/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "cocoapods"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-common-dependencies-warning/settings.gradle.kts

@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id("org.jetbrains.kotlin.multiplatform") version "${extra["kotlin_version"]}"
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-endorsed"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-endorsed"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-external-dependencies/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-external-dependencies"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/settings.gradle

@@ -1,7 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/app/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "app"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v1.0/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "liba"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v2.0/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "liba"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/libb/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "libb"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-ktor-and-coroutines/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "native-ir-linker-issues-ktor-and-coroutines"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/app/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "app"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v1.0/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "liba"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v2.0/settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-enableFeaturePreview('GRADLE_METADATA')
-
 rootProject.name = "liba"