diff --git a/build.gradle.kts b/build.gradle.kts index bb31ef14a93..084223d0f09 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -755,19 +755,19 @@ tasks { register("publishIdeArtifacts") { idePluginDependency { dependsOn( - ":prepare:ide-artifacts:android-extensions-compiler-plugin-for-ide:publish", - ":prepare:ide-artifacts:allopen-compiler-plugin-for-ide:publish", - ":prepare:ide-artifacts:allopen-compiler-plugin-tests-for-ide:publish", - ":prepare:ide-artifacts:incremental-compilation-impl-tests-for-ide:publish", - ":prepare:ide-artifacts:kotlin-build-common-tests-for-ide:publish", - ":prepare:ide-artifacts:kotlin-compiler-for-ide:publish", - ":prepare:ide-artifacts:kotlin-dist-for-ide:publish", - ":prepare:ide-artifacts:kotlin-gradle-statistics-for-ide:publish", - ":prepare:ide-artifacts:kotlinx-serialization-compiler-plugin-for-ide:publish", - ":prepare:ide-artifacts:noarg-compiler-plugin-for-ide:publish", - ":prepare:ide-artifacts:sam-with-receiver-compiler-plugin-for-ide:publish", - ":prepare:ide-artifacts:tests-common-tests-for-ide:publish", - ":prepare:ide-artifacts:compiler-components-for-jps:publish", + ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide:publish", + ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide:publish", + ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide:publish", + ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide:publish", + ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide:publish", + ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide:publish", + ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide:publish", + ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide:publish", + ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide:publish", + ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide:publish", + ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide:publish", + ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide:publish", + ":prepare:ide-plugin-dependencies:compiler-components-for-jps:publish", ":kotlin-script-runtime:publish", ":kotlin-script-util:publish", ":kotlin-scripting-common:publish", diff --git a/prepare/ide-artifacts/allopen-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/allopen-compiler-plugin-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/allopen-compiler-plugin-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/allopen-compiler-plugin-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/allopen-compiler-plugin-tests-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/android-extensions-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/android-extensions-compiler-plugin-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/android-extensions-compiler-plugin-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/android-extensions-compiler-plugin-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/compiler-components-for-jps/build.gradle.kts b/prepare/ide-plugin-dependencies/compiler-components-for-jps/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/compiler-components-for-jps/build.gradle.kts rename to prepare/ide-plugin-dependencies/compiler-components-for-jps/build.gradle.kts diff --git a/prepare/ide-artifacts/incremental-compilation-impl-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/incremental-compilation-impl-tests-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/kotlin-build-common-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/kotlin-build-common-tests-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/kotlin-compiler-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/kotlin-compiler-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/kotlin-dist-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/kotlin-dist-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/kotlin-gradle-statistics-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-gradle-statistics-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/kotlin-gradle-statistics-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/kotlin-gradle-statistics-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/noarg-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/noarg-compiler-plugin-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/noarg-compiler-plugin-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/noarg-compiler-plugin-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts diff --git a/prepare/ide-artifacts/tests-common-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/tests-common-tests-for-ide/build.gradle.kts similarity index 100% rename from prepare/ide-artifacts/tests-common-tests-for-ide/build.gradle.kts rename to prepare/ide-plugin-dependencies/tests-common-tests-for-ide/build.gradle.kts diff --git a/settings.gradle b/settings.gradle index f7987c0eb83..a4d81d91c93 100644 --- a/settings.gradle +++ b/settings.gradle @@ -306,19 +306,19 @@ include ":kotlin-build-common", ":kotlin-serialization-unshaded", ":kotlin-serialization:plugin-marker" -include ":prepare:ide-artifacts:android-extensions-compiler-plugin-for-ide", - ":prepare:ide-artifacts:allopen-compiler-plugin-for-ide", - ":prepare:ide-artifacts:allopen-compiler-plugin-tests-for-ide", - ":prepare:ide-artifacts:incremental-compilation-impl-tests-for-ide", - ":prepare:ide-artifacts:kotlin-build-common-tests-for-ide", - ":prepare:ide-artifacts:kotlin-compiler-for-ide", - ":prepare:ide-artifacts:kotlin-dist-for-ide", - ":prepare:ide-artifacts:kotlin-gradle-statistics-for-ide", - ":prepare:ide-artifacts:kotlinx-serialization-compiler-plugin-for-ide", - ":prepare:ide-artifacts:noarg-compiler-plugin-for-ide", - ":prepare:ide-artifacts:sam-with-receiver-compiler-plugin-for-ide", - ":prepare:ide-artifacts:tests-common-tests-for-ide", - ":prepare:ide-artifacts:compiler-components-for-jps" +include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide", + ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide", + ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide", + ":prepare:ide-plugin-dependencies:compiler-components-for-jps" if (buildProperties.includeCidrPlugins) { logger.info("Including CIDR modules in settings.gradle")