diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 6318eac9dd1..5f0848dd8a0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/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() + } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 4b44c91af7e..383f86ed052 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/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", diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt index 6d498b19367..98e17756862 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt +++ b/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") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/settings.gradle index 1e74d615df6..db94fbc4f4f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/settings.gradle +++ b/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' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/settings.gradle.kts index 312fac5127b..84ed06d4c65 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleXCFramework/settings.gradle.kts @@ -1,13 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - mavenCentral() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - -include(":shared") \ No newline at end of file +include(":shared") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/associatedDependencies/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/associatedDependencies/settings.gradle deleted file mode 100644 index de7969b173a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/associatedDependencies/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } - - plugins { - id "org.jetbrains.kotlin.jvm" version "$kotlin_version" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts index 791f1f19e9f..eb1e8085116 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts +++ b/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() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/settings.gradle deleted file mode 100644 index 9dddddd9eb7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -enableFeaturePreview('GRADLE_METADATA') \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts index 5dcf1646c2b..bf708aa0fe0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts +++ b/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() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/settings.gradle deleted file mode 100644 index 9dddddd9eb7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -enableFeaturePreview('GRADLE_METADATA') \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/settings.gradle.kts index 3bfbb08f1b9..7760b86f302 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/settings.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-failing/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-failing/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-failing/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/settings.gradle.kts deleted file mode 100644 index 42c04f103d7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/common-klib-lib-and-app/settings.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46142-singleNativeTarget/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46142-singleNativeTarget/settings.gradle.kts index ac06873d297..5ee038c5205 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46142-singleNativeTarget/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46142-singleNativeTarget/settings.gradle.kts @@ -1,12 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - -include(":p1") \ No newline at end of file +include(":p1") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46234-singleNativeTarget/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46234-singleNativeTarget/settings.gradle.kts index ac06873d297..5ee038c5205 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46234-singleNativeTarget/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46234-singleNativeTarget/settings.gradle.kts @@ -1,12 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - -include(":p1") \ No newline at end of file +include(":p1") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/settings.gradle.kts index ac06873d297..5ee038c5205 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/settings.gradle.kts @@ -1,12 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - -include(":p1") \ No newline at end of file +include(":p1") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47641-cinterops-compilation-dependency/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47641-cinterops-compilation-dependency/settings.gradle.kts index 9057acf36fa..df6a9401d10 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47641-cinterops-compilation-dependency/settings.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48118-c-interop-in-common-main/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48856-singleNativeTargetPropagation-testSourceSet/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48856-singleNativeTargetPropagation-testSourceSet/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48856-singleNativeTargetPropagation-testSourceSet/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-49735-twoKotlinTargets-oneKonanTarget/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/settings.gradle.kts deleted file mode 100644 index 9612ae41b9a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/settings.gradle.kts index 629f9fe9ecb..5ee038c5205 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/settings.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/settings.gradle.kts index 006882d6c91..be1a86c0d59 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/settings.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyPlatformDependencies/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyPlatformDependencies/settings.gradle.kts deleted file mode 100644 index 92e9d3068fc..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyPlatformDependencies/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/settings.gradle.kts deleted file mode 100644 index 9612ae41b9a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeMultipleCInteropsWithTests/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeMultipleCInteropsWithTests/settings.gradle.kts deleted file mode 100644 index 9612ae41b9a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeMultipleCInteropsWithTests/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeNativeDistributionWithIosLinuxWindows/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeNativeDistributionWithIosLinuxWindows/settings.gradle.kts index dbf4ad88128..2fe8d282293 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeNativeDistributionWithIosLinuxWindows/settings.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/settings.gradle.kts deleted file mode 100644 index 9612ae41b9a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/settings.gradle.kts deleted file mode 100644 index 9612ae41b9a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/both/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/both/settings.gradle.kts deleted file mode 100644 index 3b582363c98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/both/settings.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-ext/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-ext/settings.gradle deleted file mode 100644 index 3b582363c98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-ext/settings.gradle +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-root/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-root/settings.gradle deleted file mode 100644 index 3b582363c98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-root/settings.gradle +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-ext/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-ext/settings.gradle.kts deleted file mode 100644 index 3b582363c98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-ext/settings.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-root/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-root/settings.gradle.kts deleted file mode 100644 index 3b582363c98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-root/settings.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/without-generate-externals/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/without-generate-externals/settings.gradle.kts deleted file mode 100644 index 3b582363c98..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/without-generate-externals/settings.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-all-native/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-all-native/settings.gradle.kts index 0f81f6b3861..5c63e2551ab 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-all-native/settings.gradle.kts +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/settings.gradle.kts index 0f81f6b3861..5c63e2551ab 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/settings.gradle.kts +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/settings.gradle index 275d71ca130..93263243412 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/settings.gradle +++ b/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' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-project-dependency/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-project-dependency/settings.gradle.kts index 239f39c62a9..63443f31e20 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-project-dependency/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/settings.gradle.kts index 290414f38b4..51d315a1d59 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/settings.gradle.kts index 17a7c7b3b1d..2bbb87dde93 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/settings.gradle.kts index e0ae6817795..514c85d5927 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/settings.gradle.kts index 055148414fb..917c26d1308 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/settings.gradle.kts index 941a4800190..29eadbac3ec 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/settings.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/settings.gradle.kts index e0ae6817795..514c85d5927 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/settings.gradle.kts +++ b/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") \ 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/third-party-lib/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/settings.gradle.kts index 055148414fb..917c26d1308 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecution/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecution/settings.gradle index aaec1083252..5aa489cec08 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecution/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecution/settings.gradle @@ -6,4 +6,4 @@ dependencyResolutionManagement { } } -include ':main-project', ':lib-project' \ No newline at end of file +include ':main-project', ':lib-project' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/settings.gradle index 649193e6640..06b107a7ca0 100755 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/settings.gradle +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir/settings.gradle.kts deleted file mode 100644 index b63391625d2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir/settings.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } - - plugins { - id("org.jetbrains.kotlin.multiplatform") version "${extra["kotlin_version"]}" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable-browser-nodejs/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable-browser-nodejs/settings.gradle.kts index 0141db69d07..b11e6ba402c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable-browser-nodejs/settings.gradle.kts +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable/settings.gradle.kts index 0141db69d07..b11e6ba402c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-with-executable/settings.gradle.kts +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/jvm-and-js-hmpp/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/jvm-and-js-hmpp/settings.gradle.kts index 055148414fb..917c26d1308 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/jvm-and-js-hmpp/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/settings.gradle deleted file mode 100644 index e003591d778..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/settings.gradle +++ /dev/null @@ -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" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/settings.gradle deleted file mode 100644 index 418b110f9a3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/settings.gradle +++ /dev/null @@ -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" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/mppJvmWithJava/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/mppJvmWithJava/settings.gradle deleted file mode 100644 index 491d2d45aa2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/mppJvmWithJava/settings.gradle +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - } - - plugins { - id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/settings.gradle index 4de750d492e..bb57e5ac101 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/settings.gradle +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts index 33e64a1dd83..e15f3dbd8ce 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts +++ b/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("") + kotlin("js") id("kotlin-dce-js") `maven-publish` } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/settings.gradle index ad4f3a6409f..178d0110d2d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/settings.gradle +++ b/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:") - } - } - } - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "kotlin-js-plugin" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-mpp-classpathMode/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-mpp-classpathMode/settings.gradle.kts deleted file mode 100644 index ecdece6ecfe..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-mpp-classpathMode/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts deleted file mode 100644 index 1a69c220d39..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ - -pluginManagement { - repositories { - mavenCentral() - mavenLocal() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinProject/settings.gradle deleted file mode 100644 index 801a3318090..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinProject/settings.gradle +++ /dev/null @@ -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" - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/settings.gradle.kts index cc8bb315291..f7a5e95fcee 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/settings.gradle.kts +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/settings.gradle.kts index f57c1dd5472..3f8811f3f45 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/settings.gradle.kts +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/settings.gradle index bf01efa8996..71d6bf80a4b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/settings.gradle @@ -1,18 +1 @@ -pluginManagement { - 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") \ No newline at end of file +include(":mpp-lib", ":jvm-app", ":js-app") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/settings.gradle index 15f80947a8f..f128dcf1ec8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/settings.gradle +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-46417-ios-test-source-sets/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-46417-ios-test-source-sets/settings.gradle.kts index 1f2a7581563..a82b1385b29 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-46417-ios-test-source-sets/settings.gradle.kts +++ b/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") - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-single-jvm-target/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-single-jvm-target/settings.gradle.kts deleted file mode 100644 index 92e9d3068fc..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-single-jvm-target/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - val kotlin_version: String by settings - plugins { - kotlin("multiplatform").version(kotlin_version) - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/settings.gradle deleted file mode 100644 index 7c4ce35fca1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppJvmWithJava/settings.gradle +++ /dev/null @@ -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") - } - } - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts index 3ef9e64b9fd..87b1985caaf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/settings.gradle.kts index 3ef9e64b9fd..87b1985caaf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/settings.gradle.kts index 3ef9e64b9fd..87b1985caaf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/settings.gradle.kts +++ b/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") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/executables/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/executables/settings.gradle index 046fa910789..a7fc259a838 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/executables/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/settings.gradle index 962dfd54e0b..a6cccae0674 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/frameworks/settings.gradle +++ b/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' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/groovy-dsl/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/groovy-dsl/settings.gradle index 0bb55ac1af4..ad1ba9b25c8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/groovy-dsl/settings.gradle +++ b/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' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/kotlin-dsl/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/kotlin-dsl/settings.gradle index 0cc7b0f4864..ad1ba9b25c8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/kotlin-dsl/settings.gradle +++ b/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' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/settings.gradle index 280807afbe3..c2182ba8066 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-binaries/libraries/settings.gradle +++ b/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' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cinterop/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cinterop/settings.gradle index 740d786ca9c..1303e286e3d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cinterop/settings.gradle +++ b/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' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-commonization/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-commonization/settings.gradle index 1fb6657dc9b..a3888162cd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-commonization/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/settings.gradle index 8b6abe527fc..48604b0c574 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/settings.gradle +++ b/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' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/settings.gradle index 8f6cb81d6f4..29c5982a6c0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/settings.gradle +++ b/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' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/settings.gradle index ae6eb00055e..a3888162cd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/settings.gradle index ae6eb00055e..a3888162cd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-tests/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-tests/settings.gradle index ae6eb00055e..a3888162cd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-tests/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-common-dependencies-warning/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-common-dependencies-warning/settings.gradle.kts deleted file mode 100644 index b63391625d2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-common-dependencies-warning/settings.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } - - plugins { - id("org.jetbrains.kotlin.multiplatform") version "${extra["kotlin_version"]}" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle index d796ed8ded8..0acb7363f6e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/settings.gradle index d796ed8ded8..0acb7363f6e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-external-dependencies/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-external-dependencies/settings.gradle index b19c4128428..39026b91fbb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-external-dependencies/settings.gradle +++ b/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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/settings.gradle deleted file mode 100644 index 343d6acb1ec..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/settings.gradle +++ /dev/null @@ -1,7 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/app/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/app/settings.gradle index e7d9b686eb1..85cd6d259b5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/app/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v1.0/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v1.0/settings.gradle index d0b88d86a12..c00f114e634 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v1.0/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v2.0/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v2.0/settings.gradle index d0b88d86a12..c00f114e634 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/liba-v2.0/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/libb/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/libb/settings.gradle index fb3dce4eb44..5b4c894975a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-gone-declaration/libb/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-ktor-and-coroutines/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-ktor-and-coroutines/settings.gradle index bb6ed669fa6..39fa5dfa7a1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-ktor-and-coroutines/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/app/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/app/settings.gradle index e7d9b686eb1..85cd6d259b5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/app/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v1.0/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v1.0/settings.gradle index d0b88d86a12..c00f114e634 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v1.0/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v2.0/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v2.0/settings.gradle index d0b88d86a12..c00f114e634 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/liba-v2.0/settings.gradle +++ b/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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/libb/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/libb/settings.gradle index fb3dce4eb44..5b4c894975a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/libb/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-ir-linker-issues-symbol-mismatch/libb/settings.gradle @@ -1,11 +1 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } -} - -enableFeaturePreview('GRADLE_METADATA') - rootProject.name = "libb" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-kotlin-options/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-kotlin-options/settings.gradle index 324ee12d876..af1f75f6ad7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-kotlin-options/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-kotlin-options/settings.gradle @@ -1,11 +1 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } -} - -enableFeaturePreview('GRADLE_METADATA') - rootProject.name = 'native-linker-options' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/settings.gradle index 7f1e2a4075c..2889dbbca90 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-libraries/settings.gradle @@ -1,3 +1 @@ -enableFeaturePreview('GRADLE_METADATA') - rootProject.name = 'native-lib' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-parallel/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-parallel/settings.gradle.kts index f50dc3ca09c..aff2acea74b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-parallel/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-parallel/settings.gradle.kts @@ -1,9 +1 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } -} - include(":one", ":two") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-platform-libraries/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-platform-libraries/settings.gradle.kts deleted file mode 100644 index 3ef9ed6f244..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-platform-libraries/settings.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/settings.gradle index 159fa2790f6..de55f3ee94f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/settings.gradle @@ -1,3 +1 @@ -enableFeaturePreview('GRADLE_METADATA') - rootProject.name = 'native-tests' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/settings.gradle.kts index 3b614cad5d7..beb0025f5d5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-kn-library-dsl/settings.gradle.kts @@ -1,18 +1,2 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - mavenCentral() - } - resolutionStrategy { - val kotlin_version: String by settings - eachPlugin { - when (requested.id.id) { - "org.jetbrains.kotlin.multiplatform" -> useVersion(kotlin_version) - } - } - } -} - include(":shared") include(":lib") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/settings.gradle.kts index 21a19d3645c..0403859c794 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/settings.gradle.kts @@ -1,8 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "new-model" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/settings.gradle.kts index 2ac01aae693..bac91876753 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/settings.gradle.kts @@ -1,28 +1,3 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - google() - } - - 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") - } - } - } -} - include(":producer") include(":plainAndroidConsumer") include(":multiplatformAndroidConsumer") - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/settings.gradle index 7f5080f8bf1..3cbe2493511 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/settings.gradle @@ -1,2 +1 @@ include ':app', ':lib' -enableFeaturePreview('GRADLE_METADATA') \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/settings.gradle.kts index efe86901347..01135cfdad8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-associate-compilations/settings.gradle.kts @@ -1,8 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "new-mpp-associate-compilations" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/settings.gradle.kts index 93b60c43717..8084a4369b4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/settings.gradle.kts @@ -1,8 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "new-mpp-js-tests" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-klibs-with-same-name/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-klibs-with-same-name/settings.gradle.kts index 43a6594ab89..7b11603f188 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-klibs-with-same-name/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-klibs-with-same-name/settings.gradle.kts @@ -1,10 +1,2 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } -} - include("foo") include("foo:foo") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts index 0e7ba341fe9..eb1e8085116 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-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() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-without-kotlin/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-without-kotlin/settings.gradle deleted file mode 100644 index 9dddddd9eb7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-without-kotlin/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -enableFeaturePreview('GRADLE_METADATA') \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/settings.gradle deleted file mode 100644 index 9dddddd9eb7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -enableFeaturePreview('GRADLE_METADATA') \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle index 401f1df0993..c87be161762 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/settings.gradle @@ -1,2 +1 @@ -enableFeaturePreview('GRADLE_METADATA') rootProject.name = 'external' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts index 75a0c6e2fbd..bf708aa0fe0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-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() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle index 50965ce7e5d..dcba604e13a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle @@ -1,3 +1 @@ -enableFeaturePreview('GRADLE_METADATA') - include 'app-common', 'app-jvm', 'app-js' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/settings.gradle deleted file mode 100644 index 42c04f103d7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/settings.gradle +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/settings.gradle.kts index 17a7c7b3b1d..2bbb87dde93 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/settings.gradle.kts @@ -1,10 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "my-lib-bar" - -enableFeaturePreview("GRADLE_METADATA") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/settings.gradle.kts index f6c3b197601..614f4ab3003 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/settings.gradle.kts @@ -1,8 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "new-mpp-wasm-js" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/newMppDependenciesDsl/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/newMppDependenciesDsl/settings.gradle index d0a0e31da1c..b1de2138f4f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/newMppDependenciesDsl/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/newMppDependenciesDsl/settings.gradle @@ -1,8 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - include ':lib', ':app' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/sharedAppleFramework/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/sharedAppleFramework/settings.gradle.kts index d9947b73c00..d34ba7b5723 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/sharedAppleFramework/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/sharedAppleFramework/settings.gradle.kts @@ -1,9 +1 @@ -pluginManagement { - repositories { - google() - gradlePluginPortal() - mavenCentral() - } -} - include(":shared") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/settings.gradle.kts index 0141db69d07..b11e6ba402c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/settings.gradle.kts @@ -1,8 +1 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - rootProject.name = "js-library" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/settings.gradle deleted file mode 100644 index de7969b173a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } - - plugins { - id "org.jetbrains.kotlin.jvm" version "$kotlin_version" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/settings.gradle.kts index aae5124f5f2..621d1ad2972 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/transitive-dep-on-self-hmpp/settings.gradle.kts @@ -1,14 +1,3 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } - plugins { - val kotlin_version: String by settings - kotlin("multiplatform").version(kotlin_version) - } -} - rootProject.name = "lib-and-app" include("lib")