Skip to content

Commit

Permalink
apply .convention-core-library (#11464)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sdelamo authored Dec 23, 2024
1 parent f6eb101 commit 65b5709
Show file tree
Hide file tree
Showing 40 changed files with 44 additions and 46 deletions.
2 changes: 1 addition & 1 deletion aop/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion buffer-netty/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion context-propagation/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions context/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion core-processor/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core-reactive/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion discovery-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions function-client/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions function-web/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions function/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion graal/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion http-client-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion http-client-jdk/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("io.micronaut.build.internal.convention-library")
id("io.micronaut.build.internal.convention-core-library")
}

micronautBuild {
Expand Down
2 changes: 1 addition & 1 deletion http-client-tck/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion http-client/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion http-netty/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

micronautBuild {
Expand Down
2 changes: 1 addition & 1 deletion http-server-netty/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion http-server-tck/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("io.micronaut.build.internal.convention-library")
id("io.micronaut.build.internal.convention-core-library")
}
dependencies {
annotationProcessor(projects.injectJava)
Expand Down
2 changes: 1 addition & 1 deletion http-server/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions http-tck/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

plugins {
id("io.micronaut.build.internal.convention-library")
id("io.micronaut.build.internal.convention-core-library")
}
dependencies {
annotationProcessor(projects.injectJava)
Expand Down
2 changes: 1 addition & 1 deletion http-validation/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions http/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion inject-groovy-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion inject-groovy/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion inject-java-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion inject-java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

micronautBuild {
Expand Down
2 changes: 1 addition & 1 deletion inject-kotlin-test/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion inject-kotlin/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion inject/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-core-library"
id("io.micronaut.build.internal.convention-core-library")
}

micronautBuild {
Expand Down
2 changes: 1 addition & 1 deletion jackson-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion jackson-databind/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion json-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion management/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion messaging/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

micronautBuild {
Expand Down
2 changes: 1 addition & 1 deletion retry/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion router/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion runtime-osx/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion runtime/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-core-library"
id("io.micronaut.build.internal.convention-core-library")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion websocket/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.micronaut.build.internal.convention-library"
id("io.micronaut.build.internal.convention-core-library")
}

import java.time.Duration
Expand Down

0 comments on commit 65b5709

Please sign in to comment.