Update build to latest infrastructure

build.gradle

@@ -1,42 +1,4 @@
-buildscript {
- repositories {
- mavenCentral()
- gradlePluginPortal()
- }
- dependencies {
- classpath "io.micronaut.build.internal:micronaut-gradle-plugins:4.1.5"
- }
-}
-
-repositories {
- maven { url "https://repo.grails.org/grails/core" }
-}
-
-subprojects { Project subproject ->
- group "io.micronaut.test"
-
- if (subproject.name != 'test-bom' && subproject.name != 'test-junit5') {
- apply plugin: "io.micronaut.build.internal.common"
-
- micronautBuild {
- resolutionStrategy {
- eachDependency { DependencyResolveDetails details ->
- String group = details.requested.group
- if (group.startsWith('org.jetbrains.kotlin') && group != 'org.jetbrains.kotlinx') {
- details.useVersion kotlinVersion
- }
- }
- }
- }
-
- } else if (subproject.name != 'test-junit5') {
- apply plugin: "java-platform"
- version projectVersion
- }
-
- apply plugin: "io.micronaut.build.internal.dependency-updates"
- apply plugin: "io.micronaut.build.internal.publishing"
-}
-
-apply plugin: "io.micronaut.build.internal.docs"
-apply plugin: "io.micronaut.build.internal.dependency-updates"
+plugins {
+ id "io.micronaut.build.internal.docs"
+ id "io.micronaut.build.internal.dependency-updates"
+}

gradle.properties

@@ -1,4 +1,6 @@
 projectVersion=3.0.6-SNAPSHOT
+projectGroup=io.micronaut.test
+
 micronautDocsVersion=2.0.0.RC1
 micronautVersion=3.0.0
 
@@ -30,7 +32,4 @@ junit5tests=test-junit5/src/test/java/io/micronaut/test/junit5
 kotesttests=test-kotest/src/test/kotlin/io/micronaut/test/kotest
 
 org.gradle.caching=true
-org.gradle.daemon=false
-# Workaround for https://issues.sonatype.org/browse/MVNCENTRAL-5276
-# See https://github.com/gradle/gradle/issues/11308 for more details
-systemProp.org.gradle.internal.publish.checksums.insecure=true
+org.gradle.parallel=true

settings.gradle

@@ -1,13 +1,14 @@
-plugins {
- id "com.gradle.enterprise" version "3.1.1"
-}
-gradleEnterprise {
- buildScan {
- termsOfServiceUrl = 'https://gradle.com/terms-of-service'
- termsOfServiceAgree = 'yes'
+pluginManagement {
+ repositories {
+ gradlePluginPortal()
+ mavenCentral()
  }
 }
 
+plugins {
+ id("io.micronaut.build.shared.settings") version "5.2.1"
+}
+
 rootProject.name = 'micronaut-test'
 
 include 'test-bom'

test-bom/build.gradle

@@ -1,16 +1,11 @@
-javaPlatform {
- allowDependencies()
+plugins {
+ id "io.micronaut.build.internal.bom"
 }
+
 dependencies {
  api platform("org.junit:junit-bom:$junitVersion")
  api platform("org.spockframework:spock-bom:$spockVersion")
-
  constraints {
- for (Project p : rootProject.subprojects) {
- if (p.name == "test-bom") continue
- api "$p.group:micronaut-$p.name:$p.version"
- }
-
  api "io.kotest:kotest-runner-junit5-jvm:$kotestVersion"
  api "io.kotest:kotest-assertions-core-jvm:$kotestVersion"
  api "io.mockk:mockk:$mockkVersion"

test-core/build.gradle

@@ -1,16 +1,14 @@
+plugins {
+ id "io.micronaut.build.internal.module"
+}
+
 dependencies {
- annotationProcessor "io.micronaut:micronaut-inject-java:$micronautVersion"
- compileOnly "io.micronaut:micronaut-http-server:$micronautVersion"
- compileOnly("org.spockframework:spock-core:$spockVersion") {
- exclude group: "org.codehaus.groovy", module: "groovy-all"
- }
- compileOnly(
- "org.junit.jupiter:junit-jupiter-api:$junitVersion"
- )
+ compileOnly "io.micronaut:micronaut-http-server"
+ compileOnly("org.junit.jupiter:junit-jupiter-api:$junitVersion")
 
  api "io.micronaut:micronaut-inject:$micronautVersion"
 
- implementation "io.micronaut:micronaut-runtime:$micronautVersion"
+ implementation "io.micronaut:micronaut-runtime"
 }
 
 jar {

test-junit5/build.gradle

@@ -1,17 +1,15 @@
 plugins {
- id 'org.graalvm.buildtools.native' version '0.9.8'
- id "java-library"
+  id 'org.graalvm.buildtools.native' version '0.9.10'
+  id "io.micronaut.build.internal.base-module"
 }
 
 repositories {
  mavenCentral()
 }
-version projectVersion
 
 java {
  sourceCompatibility = "1.8"
  targetCompatibility = "1.8"
-
 }
 
 tasks.withType(Test).configureEach {
@@ -24,6 +22,12 @@ tasks.withType(Test).configureEach {
  useJUnitPlatform()
 }
 
+configurations {
+ nativeImageTestClasspath {
+ exclude(group: 'org.codehaus.groovy')
+ }
+}
+
 tasks.withType(JavaCompile).configureEach {
  options.encoding = "UTF-8"
  options.compilerArgs.add('-parameters')
@@ -36,35 +40,33 @@ tasks.withType(Jar).configureEach {
  attributes('Implementation-Title': project.findProperty("title"))
  }
 }
+
 dependencies {
  api project(":test-core")
- api "io.micronaut:micronaut-inject:$micronautVersion"
- implementation "io.micronaut:micronaut-runtime:$micronautVersion"
+ api "io.micronaut:micronaut-inject"
+ implementation "io.micronaut:micronaut-runtime"
  compileOnly "org.graalvm.nativeimage:svm:21.3.0"
  api("org.junit.jupiter:junit-jupiter-api:$junitVersion")
 
- testCompileOnly "io.micronaut:micronaut-inject:$micronautVersion"
+ testCompileOnly "io.micronaut:micronaut-inject"
  testRuntimeOnly(
  "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
  )
 
  testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
- testAnnotationProcessor "io.micronaut:micronaut-inject-java:$micronautVersion"
- testAnnotationProcessor "io.micronaut:micronaut-graal:$micronautVersion"
- testImplementation "io.micronaut:micronaut-http-server-netty:$micronautVersion"
- testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
+ testAnnotationProcessor "io.micronaut:micronaut-inject-java"
+ testAnnotationProcessor "io.micronaut:micronaut-graal"
+ testImplementation "io.micronaut:micronaut-http-server-netty"
+ testImplementation "io.micronaut:micronaut-http-client"
  testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
  testImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
  testImplementation "io.micronaut.data:micronaut-data-tx:2.4.7"
  testImplementation "io.micronaut.data:micronaut-data-hibernate-jpa:2.4.7"
 
  testRuntimeOnly "io.micronaut.sql:micronaut-jdbc-tomcat:$micronautSqlVersion"
  testRuntimeOnly "com.h2database:h2:1.4.200"
-
 }
 
-
-
 graalvmNative {
  binaries {
  test {

test-kotest/build.gradle

@@ -1,12 +1,13 @@
 plugins {
  id "org.jetbrains.kotlin.jvm" version "$kotlinVersion"
  id "org.jetbrains.kotlin.kapt" version "$kotlinVersion"
+ id "io.micronaut.build.internal.module"
 }
 
 dependencies {
  api project(":test-core")
- implementation "io.micronaut:micronaut-inject:$micronautVersion"
- api "io.micronaut:micronaut-runtime:$micronautVersion"
+ implementation "io.micronaut:micronaut-inject"
+ api "io.micronaut:micronaut-runtime"
  api "io.kotest:kotest-runner-junit5-jvm:$kotestVersion"
 
  implementation project(":test-junit5")
@@ -18,10 +19,12 @@ dependencies {
  testCompileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
 
  testImplementation "io.mockk:mockk:$mockkVersion"
- kaptTest "io.micronaut:micronaut-inject-java:$micronautVersion"
 
- testImplementation "io.micronaut:micronaut-http-server-netty:$micronautVersion"
- testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
+ kaptTest(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+ kaptTest "io.micronaut:micronaut-inject-java"
+
+ testImplementation "io.micronaut:micronaut-http-server-netty"
+ testImplementation "io.micronaut:micronaut-http-client"
 
  testImplementation "io.micronaut.data:micronaut-data-tx:2.4.7"
  testImplementation "io.micronaut.data:micronaut-data-hibernate-jpa:2.4.7"

test-spock/build.gradle

@@ -1,16 +1,20 @@
+plugins {
+ id "io.micronaut.build.internal.module"
+}
+
 dependencies {
  api project(":test-core")
- api "io.micronaut:micronaut-inject:$micronautVersion"
- implementation "io.micronaut:micronaut-runtime:$micronautVersion"
+ api "io.micronaut:micronaut-inject"
+ implementation "io.micronaut:micronaut-runtime"
  api("org.spockframework:spock-core:$spockVersion") {
  exclude group: "org.codehaus.groovy", module: "groovy-all"
  }
  compileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
 
  testCompileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
- testImplementation "io.micronaut:micronaut-inject-groovy:$micronautVersion"
- testImplementation "io.micronaut:micronaut-http-server-netty:$micronautVersion"
- testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
+ testImplementation "io.micronaut:micronaut-inject-groovy"
+ testImplementation "io.micronaut:micronaut-http-server-netty"
+ testImplementation "io.micronaut:micronaut-http-client"
 
  testImplementation "io.micronaut.sql:micronaut-jdbc-hikari:$micronautSqlVersion"
  testImplementation "io.micronaut.beanvalidation:micronaut-hibernate-validator"