From f25b00daa3d8db6d7a80744e94957b8f67bd4d87 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 24 Mar 2022 12:07:45 +0100 Subject: [PATCH] Migrate 'kotlin-lombok' module to variants ^KT-49227 In Progress --- libraries/tools/kotlin-lombok/build.gradle.kts | 15 +-------------- .../kotlin/lombok/gradle/LombokExtension.kt | 0 .../kotlin/lombok/gradle/LombokSubplugin.kt | 0 .../gradle/model/builder/LombokModelBuilder.kt | 0 .../kotlin/lombok/gradle/model/impl/LombokImpl.kt | 0 .../gradle-plugins/kotlin-lombok.properties | 0 6 files changed, 1 insertion(+), 14 deletions(-) rename libraries/tools/kotlin-lombok/src/{main => common}/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokExtension.kt (100%) rename libraries/tools/kotlin-lombok/src/{main => common}/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt (100%) rename libraries/tools/kotlin-lombok/src/{main => common}/kotlin/org/jetbrains/kotlin/lombok/gradle/model/builder/LombokModelBuilder.kt (100%) rename libraries/tools/kotlin-lombok/src/{main => common}/kotlin/org/jetbrains/kotlin/lombok/gradle/model/impl/LombokImpl.kt (100%) rename libraries/tools/kotlin-lombok/src/{main => common}/resources/META-INF/gradle-plugins/kotlin-lombok.properties (100%) diff --git a/libraries/tools/kotlin-lombok/build.gradle.kts b/libraries/tools/kotlin-lombok/build.gradle.kts index ed49495712d..205cf9b24e8 100644 --- a/libraries/tools/kotlin-lombok/build.gradle.kts +++ b/libraries/tools/kotlin-lombok/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - description = "Kotlin lombok compiler plugin" plugins { @@ -10,22 +8,11 @@ plugins { dependencies { embedded(project(":plugins:lombok:lombok-compiler-plugin")) { isTransitive = false } - api(project(":kotlin-gradle-plugin-model")) + commonApi(project(":kotlin-gradle-plugin-model")) } projectTest(parallel = true) -tasks { - withType { -// kotlinOptions.jdkHome = rootProject.extra["JDK_18"] as String - kotlinOptions.languageVersion = "1.4" - kotlinOptions.apiVersion = "1.4" - kotlinOptions.freeCompilerArgs += listOf( - "-Xskip-prerelease-check", "-Xsuppress-version-warnings" - ) - } -} - gradlePlugin { plugins { create("kotlinLombokPlugin") { diff --git a/libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokExtension.kt b/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokExtension.kt similarity index 100% rename from libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokExtension.kt rename to libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokExtension.kt diff --git a/libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt b/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt similarity index 100% rename from libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt rename to libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt diff --git a/libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/model/builder/LombokModelBuilder.kt b/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/model/builder/LombokModelBuilder.kt similarity index 100% rename from libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/model/builder/LombokModelBuilder.kt rename to libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/model/builder/LombokModelBuilder.kt diff --git a/libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/model/impl/LombokImpl.kt b/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/model/impl/LombokImpl.kt similarity index 100% rename from libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/model/impl/LombokImpl.kt rename to libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/model/impl/LombokImpl.kt diff --git a/libraries/tools/kotlin-lombok/src/main/resources/META-INF/gradle-plugins/kotlin-lombok.properties b/libraries/tools/kotlin-lombok/src/common/resources/META-INF/gradle-plugins/kotlin-lombok.properties similarity index 100% rename from libraries/tools/kotlin-lombok/src/main/resources/META-INF/gradle-plugins/kotlin-lombok.properties rename to libraries/tools/kotlin-lombok/src/common/resources/META-INF/gradle-plugins/kotlin-lombok.properties