Add micronaut-platform for test-suites (#192)

micronaut-projects · Sep 11, 2023 · fdd0440 · fdd0440
1 parent ef4620c
commit fdd0440
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-library-test-suite.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-library-test-suite.gradle
@@ -5,15 +5,7 @@ plugins {
 
 configurations.all {
     resolutionStrategy {
-        eachDependency {
-            if (requested.group == "io.micronaut.platform" && requested.name == "micronaut-platform") {
-                useVersion("4.0.0-M1")
-                because("There's no M2 platform yet")
-            }
-        }
-        dependencySubstitution {
-            substitute(module("io.micronaut.crac:micronaut-crac")).using(project(":micronaut-crac")).because("we work with the unreleased development version")
-        }
+        preferProjectModules()
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,11 @@
 [versions]
-micronaut = "4.0.3"
+micronaut = "4.0.6"
 
 micronaut-cache = "4.0.2"
 micronaut-data = "4.0.4"
 micronaut-docs = "2.0.0"
-micronaut-redis = "6.0.1"
+micronaut-platform = "4.0.6"
+micronaut-redis = "6.0.2"
 micronaut-serialization = "2.0.1"
 micronaut-sql = "5.0.1"
 micronaut-test = "4.0.1"
@@ -22,6 +23,7 @@ micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'mi
 
 micronaut-cache = { module = "io.micronaut.cache:micronaut-cache-bom", version.ref = "micronaut-cache" }
 micronaut-data = { module = "io.micronaut.data:micronaut-data-bom", version.ref = "micronaut-data" }
+micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version.ref = 'micronaut-platform' }
 micronaut-redis = { module = "io.micronaut.redis:micronaut-redis-bom", version.ref = "micronaut-redis" }
 micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serialization" }
 micronaut-sql = { module = "io.micronaut.sql:micronaut-sql-bom", version.ref = "micronaut-sql" }

diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '6.5.5'
+    id 'io.micronaut.build.shared.settings' version '6.5.6'
 }
 
 enableFeaturePreview('TYPESAFE_PROJECT_ACCESSORS')

diff --git a/test-suite-dbcp-jooq/build.gradle.kts b/test-suite-dbcp-jooq/build.gradle.kts
@@ -9,3 +9,7 @@ dependencies {
 
     testRuntimeOnly(mnSql.h2)
 }
+
+micronaut {
+    version.set(libs.versions.micronaut.platform.get())
+}
diff --git a/test-suite-hikari-jooq/build.gradle.kts b/test-suite-hikari-jooq/build.gradle.kts
@@ -9,3 +9,7 @@ dependencies {
 
     testRuntimeOnly(mnSql.h2)
 }
+
+micronaut {
+    version.set(libs.versions.micronaut.platform.get())
+}
diff --git a/test-suite-redis/build.gradle.kts b/test-suite-redis/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 }
 
 micronaut {
-    version.set(libs.versions.micronaut.asProvider())
+    version.set(libs.versions.micronaut.platform.get())
     testResources {
         additionalModules.set(listOf("redis"))
     }