From 21a12b9a582a809f5844d6d11a3d771a3e32094c Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 24 Mar 2022 11:50:23 +0100 Subject: [PATCH] Migrate 'kotlin-noarg' module to variants ^KT-49227 In Progress --- libraries/tools/kotlin-noarg/build.gradle.kts | 6 +++--- .../org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt | 0 .../org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt | 0 .../org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt | 0 .../kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt | 0 .../jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt | 0 .../resources/META-INF/gradle-plugins/kotlin-jpa.properties | 0 .../META-INF/gradle-plugins/kotlin-noarg.properties | 0 ...org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename libraries/tools/kotlin-noarg/src/{main => common}/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/resources/META-INF/gradle-plugins/kotlin-jpa.properties (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/resources/META-INF/gradle-plugins/kotlin-noarg.properties (100%) rename libraries/tools/kotlin-noarg/src/{main => common}/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin (100%) diff --git a/libraries/tools/kotlin-noarg/build.gradle.kts b/libraries/tools/kotlin-noarg/build.gradle.kts index 6516bcae5ae..bbc4987ffea 100644 --- a/libraries/tools/kotlin-noarg/build.gradle.kts +++ b/libraries/tools/kotlin-noarg/build.gradle.kts @@ -10,10 +10,10 @@ pill { } dependencies { - api(project(":kotlin-gradle-plugin-model")) + commonApi(project(":kotlin-gradle-plugin-model")) - compileOnly(project(":compiler")) - compileOnly(project(":kotlin-noarg-compiler-plugin")) + commonCompileOnly(project(":compiler")) + commonCompileOnly(project(":kotlin-noarg-compiler-plugin")) testImplementation(gradleApi()) testImplementation(commonDependency("junit")) diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-jpa.properties b/libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-jpa.properties similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-jpa.properties rename to libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-jpa.properties diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-noarg.properties b/libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-noarg.properties similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-noarg.properties rename to libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-noarg.properties diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin b/libraries/tools/kotlin-noarg/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin similarity index 100% rename from libraries/tools/kotlin-noarg/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin rename to libraries/tools/kotlin-noarg/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin