From 65b57096267d3a0f967e95472bf71ac01f30a608 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Mon, 23 Dec 2024 10:28:03 +0100 Subject: [PATCH] apply .convention-core-library (#11464) appy `io.micronaut.build.internal.convention-core-library` instead of `io.micronaut.build.internal.convention-library` `buildSrc` `io.micronaut.build.internal.convention-core-library` applies `io.micronaut.build.internal.convention-library` Moreover, use `id("io.micronaut.build.internal.convention-core-library")` to friendly to both Groovy and Kotlin DSL. --- aop/build.gradle | 2 +- buffer-netty/build.gradle | 2 +- context-propagation/build.gradle | 2 +- context/build.gradle | 3 +-- core-processor/build.gradle | 2 +- core-reactive/build.gradle | 2 +- core/build.gradle | 2 +- discovery-core/build.gradle | 2 +- function-client/build.gradle | 4 ++-- function-web/build.gradle | 4 ++-- function/build.gradle | 4 ++-- graal/build.gradle | 2 +- http-client-core/build.gradle | 2 +- http-client-jdk/build.gradle.kts | 2 +- http-client-tck/build.gradle.kts | 2 +- http-client/build.gradle | 2 +- http-netty/build.gradle | 2 +- http-server-netty/build.gradle | 2 +- http-server-tck/build.gradle.kts | 2 +- http-server/build.gradle | 2 +- http-tck/build.gradle.kts | 3 +-- http-validation/build.gradle | 2 +- http/build.gradle | 4 ++-- inject-groovy-test/build.gradle | 2 +- inject-groovy/build.gradle | 2 +- inject-java-test/build.gradle | 2 +- inject-java/build.gradle | 2 +- inject-kotlin-test/build.gradle | 2 +- inject-kotlin/build.gradle | 2 +- inject/build.gradle | 2 +- jackson-core/build.gradle | 2 +- jackson-databind/build.gradle | 2 +- json-core/build.gradle | 2 +- management/build.gradle | 2 +- messaging/build.gradle | 2 +- retry/build.gradle | 2 +- router/build.gradle | 2 +- runtime-osx/build.gradle | 2 +- runtime/build.gradle | 2 +- websocket/build.gradle | 2 +- 40 files changed, 44 insertions(+), 46 deletions(-) diff --git a/aop/build.gradle b/aop/build.gradle index 866b684d845..51e91858b3c 100644 --- a/aop/build.gradle +++ b/aop/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-core-library" + id("io.micronaut.build.internal.convention-core-library") alias libs.plugins.managed.kotlin.jvm } diff --git a/buffer-netty/build.gradle b/buffer-netty/build.gradle index e7220f6a22d..2b76b5a7f2c 100644 --- a/buffer-netty/build.gradle +++ b/buffer-netty/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/context-propagation/build.gradle b/context-propagation/build.gradle index b026ab36d12..6d161bcf33b 100644 --- a/context-propagation/build.gradle +++ b/context-propagation/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") alias libs.plugins.managed.kotlin.jvm alias libs.plugins.managed.kotlin.kapt } diff --git a/context/build.gradle b/context/build.gradle index a6055fb7cdc..46b7a74ce98 100644 --- a/context/build.gradle +++ b/context/build.gradle @@ -1,7 +1,6 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } - dependencies { annotationProcessor project(":inject-java") annotationProcessor project(":graal") diff --git a/core-processor/build.gradle b/core-processor/build.gradle index 4cc85ed42dc..482e8371adf 100644 --- a/core-processor/build.gradle +++ b/core-processor/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/core-reactive/build.gradle b/core-reactive/build.gradle index a462b76fd89..fb1c0af25c5 100644 --- a/core-reactive/build.gradle +++ b/core-reactive/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") alias libs.plugins.managed.kotlin.jvm } diff --git a/core/build.gradle b/core/build.gradle index 49e855f0093..e2f9ae11acc 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -2,7 +2,7 @@ import io.micronaut.build.internal.japicmp.RemovedPackages import me.champeau.gradle.japicmp.JapicmpTask plugins { - id "io.micronaut.build.internal.convention-core-library" + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/discovery-core/build.gradle b/discovery-core/build.gradle index 8745608bb61..b68794a3377 100644 --- a/discovery-core/build.gradle +++ b/discovery-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/function-client/build.gradle b/function-client/build.gradle index 7775cb6ab93..e40524e0568 100644 --- a/function-client/build.gradle +++ b/function-client/build.gradle @@ -1,6 +1,6 @@ plugins { - id "io.micronaut.build.internal.convention-library" -} + id("io.micronaut.build.internal.convention-core-library") + } dependencies { annotationProcessor project(":inject-java") diff --git a/function-web/build.gradle b/function-web/build.gradle index f7af7696fc8..6d64a203176 100644 --- a/function-web/build.gradle +++ b/function-web/build.gradle @@ -1,6 +1,6 @@ plugins { - id "io.micronaut.build.internal.convention-library" -} + id("io.micronaut.build.internal.convention-core-library") + } dependencies { annotationProcessor project(":inject-java") diff --git a/function/build.gradle b/function/build.gradle index 12b6d2537a5..0be60517777 100644 --- a/function/build.gradle +++ b/function/build.gradle @@ -1,6 +1,6 @@ plugins { - id "io.micronaut.build.internal.convention-library" -} + id("io.micronaut.build.internal.convention-core-library") + } dependencies { annotationProcessor project(":inject-java") diff --git a/graal/build.gradle b/graal/build.gradle index d2307e2ec76..ef767580c06 100644 --- a/graal/build.gradle +++ b/graal/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-core-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { annotationProcessor project(":inject-java") diff --git a/http-client-core/build.gradle b/http-client-core/build.gradle index 3d52f72e8b0..3a64cf02871 100644 --- a/http-client-core/build.gradle +++ b/http-client-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/http-client-jdk/build.gradle.kts b/http-client-jdk/build.gradle.kts index 23543389173..5d9dfaab341 100644 --- a/http-client-jdk/build.gradle.kts +++ b/http-client-jdk/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.micronaut.build.internal.convention-library") + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/http-client-tck/build.gradle.kts b/http-client-tck/build.gradle.kts index 5d9ce3317ee..53295ced05c 100644 --- a/http-client-tck/build.gradle.kts +++ b/http-client-tck/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.micronaut.build.internal.convention-library") + id("io.micronaut.build.internal.convention-core-library") } dependencies { annotationProcessor(project(":inject-java")) diff --git a/http-client/build.gradle b/http-client/build.gradle index 6a9c225a727..390cc1a7fb7 100644 --- a/http-client/build.gradle +++ b/http-client/build.gradle @@ -1,7 +1,7 @@ import org.apache.tools.ant.taskdefs.condition.Os plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/http-netty/build.gradle b/http-netty/build.gradle index efa81e2dd41..840b2b85ff6 100644 --- a/http-netty/build.gradle +++ b/http-netty/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/http-server-netty/build.gradle b/http-server-netty/build.gradle index d5a7bf97c12..75cf93ba63f 100644 --- a/http-server-netty/build.gradle +++ b/http-server-netty/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } import org.apache.tools.ant.taskdefs.condition.Os diff --git a/http-server-tck/build.gradle.kts b/http-server-tck/build.gradle.kts index d4d51107589..a7399f6858a 100644 --- a/http-server-tck/build.gradle.kts +++ b/http-server-tck/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.micronaut.build.internal.convention-library") + id("io.micronaut.build.internal.convention-core-library") } dependencies { annotationProcessor(projects.injectJava) diff --git a/http-server/build.gradle b/http-server/build.gradle index 2c282eea4a2..643ac84343f 100644 --- a/http-server/build.gradle +++ b/http-server/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/http-tck/build.gradle.kts b/http-tck/build.gradle.kts index 54e7f10f867..d71f1107075 100644 --- a/http-tck/build.gradle.kts +++ b/http-tck/build.gradle.kts @@ -1,6 +1,5 @@ - plugins { - id("io.micronaut.build.internal.convention-library") + id("io.micronaut.build.internal.convention-core-library") } dependencies { annotationProcessor(projects.injectJava) diff --git a/http-validation/build.gradle b/http-validation/build.gradle index 4cfa3152eff..7dbe9b9e480 100644 --- a/http-validation/build.gradle +++ b/http-validation/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/http/build.gradle b/http/build.gradle index 0e996de4a7f..b2c314b1464 100644 --- a/http/build.gradle +++ b/http/build.gradle @@ -1,7 +1,7 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") alias libs.plugins.managed.kotlin.jvm -} + } dependencies { annotationProcessor project(":inject-java") diff --git a/inject-groovy-test/build.gradle b/inject-groovy-test/build.gradle index 8d61af551d1..620e16ee4cf 100644 --- a/inject-groovy-test/build.gradle +++ b/inject-groovy-test/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/inject-groovy/build.gradle b/inject-groovy/build.gradle index 774f5d66fa6..7fa6705f69f 100644 --- a/inject-groovy/build.gradle +++ b/inject-groovy/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") id 'io.micronaut.build.internal.functional-test' } diff --git a/inject-java-test/build.gradle b/inject-java-test/build.gradle index 49a4c67b5f2..b744004ef20 100644 --- a/inject-java-test/build.gradle +++ b/inject-java-test/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/inject-java/build.gradle b/inject-java/build.gradle index 2c7af705598..13d744bf224 100644 --- a/inject-java/build.gradle +++ b/inject-java/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/inject-kotlin-test/build.gradle b/inject-kotlin-test/build.gradle index 774e3d75f4a..418b274c0d8 100644 --- a/inject-kotlin-test/build.gradle +++ b/inject-kotlin-test/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") alias libs.plugins.managed.kotlin.jvm } diff --git a/inject-kotlin/build.gradle b/inject-kotlin/build.gradle index fd5c094a05b..f9130ae88e6 100644 --- a/inject-kotlin/build.gradle +++ b/inject-kotlin/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") alias libs.plugins.managed.kotlin.jvm alias libs.plugins.managed.ksp } diff --git a/inject/build.gradle b/inject/build.gradle index f019781cfc9..9bd89ea1287 100644 --- a/inject/build.gradle +++ b/inject/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-core-library" + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/jackson-core/build.gradle b/jackson-core/build.gradle index 99b249d7889..80c876e6395 100644 --- a/jackson-core/build.gradle +++ b/jackson-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/jackson-databind/build.gradle b/jackson-databind/build.gradle index b7a625fb9bd..3e1240f684c 100644 --- a/jackson-databind/build.gradle +++ b/jackson-databind/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/json-core/build.gradle b/json-core/build.gradle index 1ac20e74492..16a7d87814a 100644 --- a/json-core/build.gradle +++ b/json-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/management/build.gradle b/management/build.gradle index 5156ecc38bd..b13acf1add2 100644 --- a/management/build.gradle +++ b/management/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/messaging/build.gradle b/messaging/build.gradle index b3263a661d2..9c92928c969 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } micronautBuild { diff --git a/retry/build.gradle b/retry/build.gradle index d84ee4e6dd3..628d53d5011 100644 --- a/retry/build.gradle +++ b/retry/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/router/build.gradle b/router/build.gradle index d16391d3529..ccb7514b76e 100644 --- a/router/build.gradle +++ b/router/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/runtime-osx/build.gradle b/runtime-osx/build.gradle index 5fe61e3e53a..854ff8864a0 100644 --- a/runtime-osx/build.gradle +++ b/runtime-osx/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/runtime/build.gradle b/runtime/build.gradle index 25863301460..1062fb888d5 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-core-library" + id("io.micronaut.build.internal.convention-core-library") } dependencies { diff --git a/websocket/build.gradle b/websocket/build.gradle index 97dae38adb0..4cf0a69dc12 100644 --- a/websocket/build.gradle +++ b/websocket/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.micronaut.build.internal.convention-library" + id("io.micronaut.build.internal.convention-core-library") } import java.time.Duration