From 8d69675e7bcf3e2668ea4cd42515b15d435475c2 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 24 Mar 2022 11:15:08 +0100 Subject: [PATCH] Migrate kotlin-allopen module to variants ^KT-49227 In Progress --- libraries/tools/kotlin-allopen/build.gradle.kts | 6 +++--- .../org/jetbrains/kotlin/allopen/gradle/AllOpenExtension.kt | 0 .../org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt | 0 .../kotlin/allopen/gradle/KotlinSpringSubplugin.kt | 0 .../allopen/gradle/model/builder/AllOpenModelBuilder.kt | 0 .../kotlin/allopen/gradle/model/impl/AllOpenImpl.kt | 0 .../META-INF/gradle-plugins/kotlin-allopen.properties | 0 .../META-INF/gradle-plugins/kotlin-spring.properties | 0 ...org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename libraries/tools/kotlin-allopen/src/{main => common}/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenExtension.kt (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/kotlin/org/jetbrains/kotlin/allopen/gradle/KotlinSpringSubplugin.kt (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/kotlin/org/jetbrains/kotlin/allopen/gradle/model/builder/AllOpenModelBuilder.kt (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/resources/META-INF/gradle-plugins/kotlin-allopen.properties (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/resources/META-INF/gradle-plugins/kotlin-spring.properties (100%) rename libraries/tools/kotlin-allopen/src/{main => common}/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin (100%) diff --git a/libraries/tools/kotlin-allopen/build.gradle.kts b/libraries/tools/kotlin-allopen/build.gradle.kts index 05e9d14d6e4..a2a9fb31169 100644 --- a/libraries/tools/kotlin-allopen/build.gradle.kts +++ b/libraries/tools/kotlin-allopen/build.gradle.kts @@ -10,10 +10,10 @@ pill { } dependencies { - api(project(":kotlin-gradle-plugin-model")) + commonApi(project(":kotlin-gradle-plugin-model")) - compileOnly(project(":kotlin-compiler-embeddable")) - compileOnly(project(":kotlin-allopen-compiler-plugin")) + commonCompileOnly(project(":kotlin-compiler-embeddable")) + commonCompileOnly(project(":kotlin-allopen-compiler-plugin")) embedded(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } } diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenExtension.kt b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenExtension.kt similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenExtension.kt rename to libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenExtension.kt diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt rename to libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/KotlinSpringSubplugin.kt b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/KotlinSpringSubplugin.kt similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/KotlinSpringSubplugin.kt rename to libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/KotlinSpringSubplugin.kt diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/builder/AllOpenModelBuilder.kt b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/model/builder/AllOpenModelBuilder.kt similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/builder/AllOpenModelBuilder.kt rename to libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/model/builder/AllOpenModelBuilder.kt diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt rename to libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt diff --git a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/kotlin-allopen.properties b/libraries/tools/kotlin-allopen/src/common/resources/META-INF/gradle-plugins/kotlin-allopen.properties similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/kotlin-allopen.properties rename to libraries/tools/kotlin-allopen/src/common/resources/META-INF/gradle-plugins/kotlin-allopen.properties diff --git a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/kotlin-spring.properties b/libraries/tools/kotlin-allopen/src/common/resources/META-INF/gradle-plugins/kotlin-spring.properties similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/kotlin-spring.properties rename to libraries/tools/kotlin-allopen/src/common/resources/META-INF/gradle-plugins/kotlin-spring.properties diff --git a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin b/libraries/tools/kotlin-allopen/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin similarity index 100% rename from libraries/tools/kotlin-allopen/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin rename to libraries/tools/kotlin-allopen/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin