From 4c2434ecf04a003ea965e289c08fa9fee809527a Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 9 Feb 2022 17:07:22 +0100 Subject: [PATCH] Migrate kotlin-lombok configuration ^KT-49227 In Progress --- .../tools/kotlin-lombok/build.gradle.kts | 35 +++++-------------- ....jetbrains.kotlin.plugin.lombok.properties | 1 - 2 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 libraries/tools/kotlin-lombok/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.lombok.properties diff --git a/libraries/tools/kotlin-lombok/build.gradle.kts b/libraries/tools/kotlin-lombok/build.gradle.kts index 48101c85296..ed49495712d 100644 --- a/libraries/tools/kotlin-lombok/build.gradle.kts +++ b/libraries/tools/kotlin-lombok/build.gradle.kts @@ -3,26 +3,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile description = "Kotlin lombok compiler plugin" plugins { - kotlin("jvm") + id("gradle-plugin-common-configuration") id("jps-compatible") } dependencies { embedded(project(":plugins:lombok:lombok-compiler-plugin")) { isTransitive = false } - compileOnly(gradleApi()) - api(project(":kotlin-gradle-plugin-api")) api(project(":kotlin-gradle-plugin-model")) } projectTest(parallel = true) -publishGradlePlugin() - -sourcesJar() -javadocJar() -runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) - tasks { withType { // kotlinOptions.jdkHome = rootProject.extra["JDK_18"] as String @@ -32,26 +24,15 @@ tasks { "-Xskip-prerelease-check", "-Xsuppress-version-warnings" ) } - - named("jar") { - callGroovy("manifestAttributes", manifest, project) - } } -pluginBundle { - fun create(name: String, id: String, display: String) { - (plugins).create(name) { - this.id = id - this.displayName = display - this.description = display +gradlePlugin { + plugins { + create("kotlinLombokPlugin") { + id = "org.jetbrains.kotlin.plugin.lombok" + displayName = "Kotlin Lombok plugin" + description = displayName + implementationClass = "org.jetbrains.kotlin.lombok.gradle.LombokSubplugin" } } - - create( - name = "kotlinLombokPlugin", - id = "org.jetbrains.kotlin.plugin.lombok", - display = "Kotlin Lombok plugin" - ) } - -publishPluginMarkers() diff --git a/libraries/tools/kotlin-lombok/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.lombok.properties b/libraries/tools/kotlin-lombok/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.lombok.properties deleted file mode 100644 index d82f3dff9ea..00000000000 --- a/libraries/tools/kotlin-lombok/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.lombok.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.lombok.gradle.LombokSubplugin