From 4401bf213e7315c377ab557b0a504aff5a3ad09c Mon Sep 17 00:00:00 2001
From: alexander-yevsyukov <alexander.yevsyukov@teamdev.com>
Date: Thu, 9 Oct 2025 18:31:30 +0100
Subject: [PATCH] Bring updates from CoreJvm

---
 buildSrc/src/main/kotlin/BuildExtensions.kt              | 2 +-
 .../kotlin/io/spine/dependency/build/GradleDoctor.kt     | 2 +-
 .../src/main/kotlin/io/spine/dependency/local/CoreJvm.kt | 9 +++++++--
 .../src/main/kotlin/io/spine/dependency/local/McJava.kt  | 2 +-
 .../src/main/kotlin/io/spine/dependency/local/TestLib.kt | 2 +-
 .../src/main/kotlin/io/spine/dependency/local/Time.kt    | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt
index 34e262b6b..5214f6e41 100644
--- a/buildSrc/src/main/kotlin/BuildExtensions.kt
+++ b/buildSrc/src/main/kotlin/BuildExtensions.kt
@@ -31,8 +31,8 @@ import io.spine.dependency.build.GradleDoctor
 import io.spine.dependency.build.Ksp
 import io.spine.dependency.build.PluginPublishPlugin
 import io.spine.dependency.lib.Protobuf
-import io.spine.dependency.local.CoreJvmCompiler
 import io.spine.dependency.local.Compiler
+import io.spine.dependency.local.CoreJvmCompiler
 import io.spine.dependency.local.McJava
 import io.spine.dependency.local.ProtoTap
 import io.spine.dependency.test.Kotest
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt
index 89cfb341b..766430bd7 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt
@@ -33,6 +33,6 @@ package io.spine.dependency.build
  */
 @Suppress("unused", "ConstPropertyName")
 object GradleDoctor {
-    const val version = "0.10.0"
+    const val version = "0.12.0"
     const val pluginId = "com.osacky.doctor"
 }
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
index 10d9a62e8..d9f5ba3b9 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
@@ -37,7 +37,7 @@ typealias CoreJava = CoreJvm
 @Suppress("ConstPropertyName", "unused")
 object CoreJvm {
     const val group = Spine.group
-    const val version = "2.0.0-SNAPSHOT.330"
+    const val version = "2.0.0-SNAPSHOT.332"
 
     const val coreArtifact = "spine-core"
     const val clientArtifact = "spine-client"
@@ -47,5 +47,10 @@ object CoreJvm {
     const val client = "$group:$clientArtifact:$version"
     const val server = "$group:$serverArtifact:$version"
 
-    const val testUtilServer = "${ToolBase.group}:spine-testutil-server:$version"
+    @Deprecated("Use `serverTestLib` instead.", ReplaceWith("serverTestLib"))
+    const val testUtilServer = "${Spine.toolsGroup}:spine-server-testlib:$version"
+
+    const val coreTestLib = "${Spine.toolsGroup}:spine-core-testlib:$version"
+    const val clientTestLib = "${Spine.toolsGroup}:spine-client-testlib:$version"
+    const val serverTestLib = "${Spine.toolsGroup}:spine-server-testlib:$version"
 }
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt
index 7a7336b71..6ab0a9565 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt
@@ -37,7 +37,7 @@ package io.spine.dependency.local
     "unused"
 )
 object McJava {
-    const val group = ToolBase.group
+    const val group = Spine.toolsGroup
 
     /**
      * The version used to in the build classpath.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
index 1f3ffc3c4..f9754bbbe 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
@@ -34,7 +34,7 @@ package io.spine.dependency.local
 @Suppress("ConstPropertyName")
 object TestLib {
     const val version = "2.0.0-SNAPSHOT.210"
-    const val group = ToolBase.group
+    const val group = Spine.toolsGroup
     const val artifact = "spine-testlib"
     const val lib = "$group:$artifact:$version"
 }
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
index c10dae577..289adeeb5 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
@@ -38,5 +38,5 @@ object Time {
     const val artifact = "spine-time"
     const val lib = "$group:$artifact:$version"
 
-    const val testLib = "${ToolBase.group}:spine-time-testlib:$version"
+    const val testLib = "${Spine.toolsGroup}:spine-time-testlib:$version"
 }