diff --git a/.idea/runConfigurations/LaunchProtoData_Remote_Debug.xml b/.idea/runConfigurations/LaunchProtoData_Remote_Debug.xml
deleted file mode 100644
index 96840422fd..0000000000
--- a/.idea/runConfigurations/LaunchProtoData_Remote_Debug.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/BuildSpeed b/BuildSpeed
index 5c46367c83..7becf5a4f0 160000
--- a/BuildSpeed
+++ b/BuildSpeed
@@ -1 +1 @@
-Subproject commit 5c46367c83c2399eae92ddb8a57ef5316a5676e3
+Subproject commit 7becf5a4f00d86a7a9a7d8cc5d57d1e8462fff4b
diff --git a/build.gradle.kts b/build.gradle.kts
index 53c022bc28..f2c0a7b669 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,7 @@
import io.spine.dependency.build.Dokka
import io.spine.dependency.lib.Protobuf
import io.spine.dependency.local.Compiler
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Validation
import io.spine.gradle.RunBuild
import io.spine.gradle.RunGradle
@@ -46,7 +46,7 @@ buildscript {
standardSpineSdkRepositories()
val toolBase = io.spine.dependency.local.ToolBase
- val coreJava = io.spine.dependency.local.CoreJava
+ val coreJava = io.spine.dependency.local.CoreJvm
val validation = io.spine.dependency.local.Validation
val logging = io.spine.dependency.local.Logging
val compiler = io.spine.dependency.local.Compiler
@@ -197,10 +197,10 @@ val coreJvmCompilerVersion: String by extra
val prepareBuildPerformanceSettings by tasks.registering(Exec::class) {
environment(
- "CORE_JVM_COMPILER_VERSION" to coreJvmCompilerVersion,
- "CORE_VERSION" to CoreJava.version,
"COMPILER_VERSION" to Compiler.version,
- "VALIDATION_VERSION" to Validation.version
+ "VALIDATION_VERSION" to Validation.version,
+ "CORE_JVM_VERSION" to CoreJvm.version,
+ "CORE_JVM_COMPILER_VERSION" to coreJvmCompilerVersion,
)
workingDir = File(rootDir, "BuildSpeed")
commandLine("./substitute-settings.py")
@@ -213,8 +213,5 @@ tasks.register("checkPerformance") {
dependsOn(prepareBuildPerformanceSettings, localPublish)
shouldRunAfter(check)
- // Do not run `BuildSpeed` until Validation is migrated to the Compiler.
- //TODO:2025-06-16:alexander.yevsyukov: Uncomment the below line, and remove `task()`
- // task("clean", "build")
- task("tasks")
+ task("clean", "build")
}
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJava.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJava.kt
rename to buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
index 91d30d315a..10d9a62e83 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJava.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
@@ -26,7 +26,8 @@
package io.spine.dependency.local
-import io.spine.dependency.local.ToolBase
+// For backward compatibility.
+typealias CoreJava = CoreJvm
/**
* Dependencies on `core-java` modules.
@@ -34,7 +35,7 @@ import io.spine.dependency.local.ToolBase
* See [`SpineEventEngine/core-java`](https://github.com/SpineEventEngine/core-java/).
*/
@Suppress("ConstPropertyName", "unused")
-object CoreJava {
+object CoreJvm {
const val group = Spine.group
const val version = "2.0.0-SNAPSHOT.330"
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt
index 2b8f0a8d2e..2b9c067c70 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt
@@ -26,8 +26,6 @@
package io.spine.dependency.local
-import io.spine.dependency.local.ToolBase
-
/**
* Dependencies on the CoreJvm Compiler artifacts.
*
@@ -48,12 +46,12 @@ object CoreJvmCompiler {
/**
* The version used to in the build classpath.
*/
- const val dogfoodingVersion = "2.0.0-SNAPSHOT.006"
+ const val dogfoodingVersion = "2.0.0-SNAPSHOT.007"
/**
* The version to be used for integration tests.
*/
- const val version = "2.0.0-SNAPSHOT.006"
+ const val version = "2.0.0-SNAPSHOT.007"
/**
* The ID of the Gradle plugin.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt
index 911e6a63e0..3bb11408c1 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt
@@ -26,8 +26,6 @@
package io.spine.dependency.local
-import io.spine.dependency.local.ToolBase
-
/**
* Dependencies on the artifacts of the Spine Logging library.
*
@@ -48,7 +46,7 @@ object Logging {
const val grpcContext = "$group:spine-logging-grpc-context:$version"
const val smokeTest = "$group:spine-logging-smoke-test:$version"
- const val testLib = "${ToolBase.group}:spine-logging-testlib:$version"
+ const val testLib = "${Spine.toolsGroup}:spine-logging-testlib:$version"
// Transitive dependencies.
// Make `public` and use them to force a version in a particular repository, if needed.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/ModelCompiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/ModelCompiler.kt
index 06c559721e..5f9e54117d 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/ModelCompiler.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/ModelCompiler.kt
@@ -26,8 +26,6 @@
package io.spine.dependency.local
-import io.spine.dependency.local.ToolBase
-
/**
* Spine Model Compiler Gradle API.
*
@@ -36,7 +34,7 @@ import io.spine.dependency.local.ToolBase
@Suppress("ConstPropertyName")
object ModelCompiler {
const val version = "2.0.0-SNAPSHOT.133"
- const val group = ToolBase.group
+ const val group = Spine.toolsGroup
const val artifact = "spine-model-compiler"
const val lib = "$group:$artifact:$version"
}
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt
index 04e513cff0..a5cce498e5 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt
@@ -32,4 +32,5 @@ package io.spine.dependency.local
@Suppress("unused", "ConstPropertyName")
object Spine {
const val group = "io.spine"
+ const val toolsGroup = "io.spine.tools"
}
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 f27f13417c..1f3ffc3c44 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
@@ -26,8 +26,6 @@
package io.spine.dependency.local
-import io.spine.dependency.local.ToolBase
-
/**
* Spine TestLib library.
*
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 1ac9d71b4c..c10dae5774 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
@@ -26,8 +26,6 @@
package io.spine.dependency.local
-import io.spine.dependency.local.ToolBase
-
/**
* Spine Time library.
*
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
index 3625a4b43d..8d5692f555 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
@@ -34,7 +34,7 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object ToolBase {
const val group = "io.spine.tools"
- const val version = "2.0.0-SNAPSHOT.355"
+ const val version = "2.0.0-SNAPSHOT.356"
const val lib = "$group:tool-base:$version"
const val pluginBase = "$group:plugin-base:$version"
diff --git a/buildSrc/src/main/kotlin/module.gradle.kts b/buildSrc/src/main/kotlin/module.gradle.kts
index c9045eb5a1..dc875c9799 100644
--- a/buildSrc/src/main/kotlin/module.gradle.kts
+++ b/buildSrc/src/main/kotlin/module.gradle.kts
@@ -38,7 +38,7 @@ import io.spine.dependency.lib.KotlinPoet
import io.spine.dependency.lib.Protobuf
import io.spine.dependency.local.Base
import io.spine.dependency.local.Compiler
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.Reflect
import io.spine.dependency.local.TestLib
@@ -148,9 +148,9 @@ fun Module.forceConfigurations() {
Reflect.lib,
Base.lib,
Time.lib,
- CoreJava.core,
- CoreJava.client,
- CoreJava.server,
+ CoreJvm.core,
+ CoreJvm.client,
+ CoreJvm.server,
TestLib.lib,
ToolBase.lib,
ToolBase.pluginBase,
diff --git a/dependencies.md b/dependencies.md
index 7d713b1522..c2e6f4515b 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -1,6 +1,6 @@
-# Dependencies of `io.spine.tools:core-jvm-annotation:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-annotation:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -1182,14 +1182,14 @@
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-base:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-base:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -2379,14 +2379,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-comparable:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-comparable:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -3568,14 +3568,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-comparable-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-comparable-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -4553,14 +4553,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-entity:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-entity:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -5742,14 +5742,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-entity-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-entity-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -6727,14 +6727,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-gradle-plugins:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-gradle-plugins:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -7960,14 +7960,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-ksp:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-ksp:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -9161,14 +9161,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-marker:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-marker:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -10358,14 +10358,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-marker-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-marker-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -11343,14 +11343,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-message-group:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-message-group:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -12540,14 +12540,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-message-group-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-message-group-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -13525,14 +13525,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-plugin-bundle:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-plugin-bundle:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -14465,10 +14465,26 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
* **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
* **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-gradle-plugin-annotations. **Version** : 2.1.21.
+ * **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
+ * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-gradle-plugin-api. **Version** : 2.1.21.
+ * **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
+ * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-gradle-plugins-bom. **Version** : 2.1.21.
+ * **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
+ * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-klib-commonizer-embeddable. **Version** : 2.1.21.
* **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
* **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-native-utils. **Version** : 2.1.21.
+ * **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
+ * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-reflect. **Version** : 2.0.21.
* **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
* **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -14533,6 +14549,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
* **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
* **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-tooling-core. **Version** : 2.1.21.
+ * **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
+ * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+1. **Group** : org.jetbrains.kotlin. **Name** : kotlin-util-io. **Version** : 2.1.21.
+ * **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
+ * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
1. **Group** : org.jetbrains.kotlinx. **Name** : atomicfu. **Version** : 0.23.1.
* **Project URL:** [https://github.com/Kotlin/kotlinx.atomicfu](https://github.com/Kotlin/kotlinx.atomicfu)
* **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -14690,14 +14714,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-routing:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-routing:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -15963,14 +15987,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-routing-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-routing-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -16980,14 +17004,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-signal:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-signal:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -18177,14 +18201,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-signal-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-signal-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -19162,14 +19186,14 @@ This report was generated on **Thu Sep 25 18:33:45 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:46 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-uuid:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-uuid:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3.
@@ -20359,14 +20383,14 @@ This report was generated on **Thu Sep 25 18:33:46 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:46 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
-# Dependencies of `io.spine.tools:core-jvm-uuid-tests:2.0.0-SNAPSHOT.007`
+# Dependencies of `io.spine.tools:core-jvm-uuid-tests:2.0.0-SNAPSHOT.008`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -21344,6 +21368,6 @@ This report was generated on **Thu Sep 25 18:33:46 WEST 2025** using
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Thu Sep 25 18:33:46 WEST 2025** using
+This report was generated on **Mon Sep 29 13:49:02 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
-[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
+[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
diff --git a/entity/build.gradle.kts b/entity/build.gradle.kts
index 2c1929d58e..2339906be1 100644
--- a/entity/build.gradle.kts
+++ b/entity/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright 2024, TeamDev. All rights reserved.
+ * Copyright 2025, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.TestLib
import io.spine.dependency.local.ToolBase
@@ -37,7 +37,7 @@ dependencies {
arrayOf(
project(":base"),
Logging.lib,
- CoreJava.server,
+ CoreJvm.server,
ToolBase.psiJava
).forEach {
implementation(it)
diff --git a/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/Artifacts.kt b/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/Artifacts.kt
index e07d704cc7..8ba33d15ca 100644
--- a/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/Artifacts.kt
+++ b/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/Artifacts.kt
@@ -28,6 +28,7 @@
package io.spine.tools.core.jvm.gradle.plugins
+import io.spine.annotation.VisibleForTesting
import io.spine.tools.gradle.Artifact.SPINE_TOOLS_GROUP
import io.spine.tools.meta.ArtifactMeta
import io.spine.tools.meta.MavenArtifact
@@ -46,7 +47,7 @@ private const val GRPC_PLUGIN_NAME = "protoc-gen-grpc-java"
/**
* Artifacts of the CoreJvm Compiler.
*/
-internal object CoreJvmCompiler {
+public object CoreJvmCompiler {
/**
* The Maven module of the CoreJvm Compiler.
@@ -63,7 +64,8 @@ internal object CoreJvmCompiler {
/**
* The Maven artifact of the CoreJvm Compiler.
*/
- internal val artifact: MavenArtifact
+ @VisibleForTesting // See `CoreJvmPluginIgTest` under the `plugin-bundle` module.
+ public val artifact: MavenArtifact
get() = meta.artifact
/**
diff --git a/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/CompilerConfigPlugin.kt b/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/CompilerConfigPlugin.kt
index 6b7a2774a0..b51ccd12fc 100644
--- a/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/CompilerConfigPlugin.kt
+++ b/gradle-plugins/src/main/kotlin/io/spine/tools/core/jvm/gradle/plugins/CompilerConfigPlugin.kt
@@ -78,9 +78,9 @@ internal class CompilerConfigPlugin : Plugin {
* Applies the `io.spine.compiler` plugin to the project and, if the user needs
* validation code generation, configures the Compiler to generate Java validation code.
*
- * ProtoData configuration is a tricky operation because of Gradle's lifecycle.
- * We need to squeeze our configuration before the `LaunchProtoData` task is configured.
- * This means adding the `afterEvaluate(..)` hook before the ProtoData Gradle plugin
+ * Spine Compiler configuration is a tricky operation because of Gradle's lifecycle.
+ * We need to squeeze our configuration before the `LaunchSpineCompiler` task is configured.
+ * This means adding the `afterEvaluate(..)` hook before the Compiler Gradle plugin
* is applied to the project.
*/
override fun apply(project: Project) {
diff --git a/message-group/build.gradle.kts b/message-group/build.gradle.kts
index 3314b38503..c50a79db92 100644
--- a/message-group/build.gradle.kts
+++ b/message-group/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright 2024, TeamDev. All rights reserved.
+ * Copyright 2025, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.Compiler
import io.spine.dependency.local.Reflect
@@ -39,7 +39,7 @@ dependencies {
arrayOf(
Reflect.lib,
Logging.lib,
- CoreJava.server,
+ CoreJvm.server,
ToolBase.psiJava,
project(":base")
).forEach {
diff --git a/plugin-bundle/build.gradle.kts b/plugin-bundle/build.gradle.kts
index 339e137e8b..31acb2305a 100644
--- a/plugin-bundle/build.gradle.kts
+++ b/plugin-bundle/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright 2024, TeamDev. All rights reserved.
+ * Copyright 2025, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,6 +26,8 @@
import groovy.util.Node
import io.spine.dependency.local.Compiler
+import io.spine.dependency.local.TestLib
+import io.spine.dependency.local.ToolBase
import io.spine.gradle.publish.SpinePublishing
plugins {
@@ -45,6 +47,15 @@ val projectArtifact = spinePublishing.artifactPrefix + "plugins"
dependencies {
implementation(project(":gradle-plugins"))
+
+ arrayOf(
+ gradleTestKit(),
+ TestLib.lib,
+ ToolBase.jvmTools,
+ ToolBase.pluginTestlib,
+ ).forEach {
+ testImplementation(it)
+ }
}
publishing {
@@ -153,8 +164,26 @@ tasks.shadowJar {
"io/spine/protodata/java/file/**",
"io/spine/protodata/protoc/**",
- "spine/protodata/**", // Protobuf definitions
- "META-INF/gradle-plugins/io.spine.protodata.properties", // Plugin declaration
+// TODO: Uncomment these after the Spine Compiler is available from Gradle Plugin Portal.
+//
+// "io/spine/tools/compiler/*",
+// "io/spine/tools/compiler/plugin/**",
+// "io/spine/tools/compiler/renderer/**",
+// "io/spine/tools/compiler/type/**",
+// "io/spine/tools/compiler/cli/app/**",
+// "io/spine/tools/compiler/gradle/plugin/**",
+// "io/spine/tools/compiler/jvm/*",
+// "io/spine/tools/compiler/jvm/annotation/**",
+// "io/spine/tools/compiler/jvm/file/**",
+// "io/spine/tools/compiler/protoc/**",
+// "spine/compiler/**",
+
+ // Protobuf definitions
+ "spine/protodata/**",
+
+ // Plugin declaration
+ "META-INF/gradle-plugins/io.spine.protodata.properties",
+// "META-INF/gradle-plugins/io.spine.compiler.properties",
/**
* Exclude Gradle types to reduce the size of the resulting JAR.
@@ -200,3 +229,10 @@ fun excludeGroupId(exclusions: Node, groupId: String) {
Node(exclusion, "groupId", groupId)
Node(exclusion, "artifactId", "*")
}
+
+/**
+ * Tests use the artifacts published to `mavenLocal`, so we need to publish them all first.
+ */
+tasks.test {
+ dependsOn(rootProject.tasks.named("localPublish"))
+}
diff --git a/plugin-bundle/src/test/kotlin/io/spine/tools/core/jvm/gradle/plugins/CoreJvmPluginIgTest.kt b/plugin-bundle/src/test/kotlin/io/spine/tools/core/jvm/gradle/plugins/CoreJvmPluginIgTest.kt
new file mode 100644
index 0000000000..a515f4989e
--- /dev/null
+++ b/plugin-bundle/src/test/kotlin/io/spine/tools/core/jvm/gradle/plugins/CoreJvmPluginIgTest.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2025, TeamDev. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package io.spine.tools.core.jvm.gradle.plugins
+
+import io.kotest.matchers.shouldBe
+import io.spine.tools.gradle.task.TaskName
+import io.spine.tools.gradle.testing.GradleProject
+import io.spine.tools.gradle.testing.get
+import java.io.File
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+
+@DisplayName("`CoreJvmPlugin` published as a fat JAR should")
+class CoreJvmPluginIgTest {
+
+ @Test
+ fun `work when applied to a single-module project via classpath`(@TempDir projectDir: File) {
+ val version = CoreJvmCompiler.artifact.version
+ val baseUrl = "https://europe-maven.pkg.dev/spine-event-engine"
+ val buildFile = """
+ |/* Auto-generated by test */
+ |buildscript {
+ | repositories {
+ | mavenLocal()
+ | mavenCentral()
+ | maven { url = uri("$baseUrl/releases") }
+ | maven { url = uri("$baseUrl/snapshots") }
+ | }
+ | dependencies {
+ | classpath("io.spine.tools:core-jvm-plugins:$version:all")
+ | }
+ |}
+ |
+ |plugins {
+ | java
+ |}
+ |
+ |apply(plugin = "io.spine.core-jvm")
+ |
+ |tasks.register("verify") {
+ | doLast {
+ | println("`CoreJvmPlugin` applied via `classpath` successfully.")
+ | }
+ |}
+ """.trimMargin()
+ val settingsFile = """
+ |rootProject.name = "core-jvm-plugin-ig-test"
+ """.trimMargin()
+ val project = GradleProject.setupAt(projectDir)
+ .copyBuildSrc()
+ .withSharedTestKitDirectory()
+ .addFile("settings.gradle.kts", settingsFile.lines())
+ .addFile("build.gradle.kts", buildFile.lines())
+ .create()
+ val verify = TaskName.of("verify")
+ val result = project.executeTask(verify)
+ result[verify] shouldBe TaskOutcome.SUCCESS
+ }
+}
diff --git a/pom.xml b/pom.xml
index 10071c3d96..ea16082468 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
-->
io.spine.toolscore-jvm-compiler
-2.0.0-SNAPSHOT.007
+2.0.0-SNAPSHOT.0082015
@@ -122,25 +122,25 @@ all modules and does not describe the project structure per-subproject.
io.spine.toolsgradle-plugin-api
- 2.0.0-SNAPSHOT.355
+ 2.0.0-SNAPSHOT.356compileio.spine.toolsjvm-tools
- 2.0.0-SNAPSHOT.355
+ 2.0.0-SNAPSHOT.356compileio.spine.toolsplugin-base
- 2.0.0-SNAPSHOT.355
+ 2.0.0-SNAPSHOT.356compileio.spine.toolspsi-java
- 2.0.0-SNAPSHOT.355
+ 2.0.0-SNAPSHOT.356compile
@@ -206,7 +206,7 @@ all modules and does not describe the project structure per-subproject.
io.spine.toolsplugin-testlib
- 2.0.0-SNAPSHOT.355
+ 2.0.0-SNAPSHOT.356test
@@ -230,7 +230,7 @@ all modules and does not describe the project structure per-subproject.
io.spine.toolstool-base
- 2.0.0-SNAPSHOT.355
+ 2.0.0-SNAPSHOT.356test
@@ -365,15 +365,20 @@ all modules and does not describe the project structure per-subproject.
compiler-protoc-plugin2.0.0-SNAPSHOT.016
+
+ io.spine.tools
+ core-jvm-gradle-plugins
+ 2.0.0-SNAPSHOT.007
+ io.spine.toolscore-jvm-plugins
- 2.0.0-SNAPSHOT.006
+ 2.0.0-SNAPSHOT.007io.spine.toolscore-jvm-routing
- 2.0.0-SNAPSHOT.006
+ 2.0.0-SNAPSHOT.007io.spine.tools
diff --git a/routing-tests/build.gradle.kts b/routing-tests/build.gradle.kts
index 319960cb04..26109cc5b0 100644
--- a/routing-tests/build.gradle.kts
+++ b/routing-tests/build.gradle.kts
@@ -28,7 +28,7 @@ import com.google.devtools.ksp.KspExperimental
import io.spine.dependency.boms.BomsPlugin
import io.spine.dependency.lib.AutoService
import io.spine.dependency.lib.AutoServiceKsp
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.test.KotlinCompileTesting
import io.spine.tools.gradle.project.sourceSets
@@ -66,13 +66,13 @@ configurations.all {
}
dependencies {
- testImplementation(CoreJava.testUtilServer)
+ testImplementation(CoreJvm.testUtilServer)
/* This makes our KSP processor work on the `testFixtures` source set. */
testFixturesCompileOnly(AutoService.annotations)
kspTestFixtures(project(":routing"))
kspTestFixtures(AutoServiceKsp.processor)
- testFixturesImplementation(CoreJava.server)
+ testFixturesImplementation(CoreJvm.server)
}
ksp {
diff --git a/routing/build.gradle.kts b/routing/build.gradle.kts
index bfdc203fb5..27cb3e0665 100644
--- a/routing/build.gradle.kts
+++ b/routing/build.gradle.kts
@@ -26,7 +26,7 @@
import io.spine.dependency.lib.KotlinPoet
import io.spine.dependency.local.Base
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.ToolBase
import io.spine.dependency.test.Kotest
@@ -55,7 +55,7 @@ dependencies {
implementation(Base.annotations)
implementation(ToolBase.jvmTools)
implementation(KotlinPoet.ksp)
- implementation(CoreJava.server)
+ implementation(CoreJvm.server)
implementation(project(":base"))
testImplementation(gradleTestKit())
diff --git a/signal/build.gradle.kts b/signal/build.gradle.kts
index 8482863a24..8edbc54df8 100644
--- a/signal/build.gradle.kts
+++ b/signal/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright 2024, TeamDev. All rights reserved.
+ * Copyright 2025, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.Compiler
import io.spine.dependency.local.TestLib
@@ -37,7 +37,7 @@ plugins {
dependencies {
arrayOf(
Logging.lib,
- CoreJava.server,
+ CoreJvm.server,
ToolBase.psiJava,
project(":base")
).forEach {
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
index 92811cc614..89fc2791ef 100644
--- a/tests/build.gradle.kts
+++ b/tests/build.gradle.kts
@@ -32,7 +32,7 @@ import io.spine.dependency.lib.Kotlin
import io.spine.dependency.lib.KotlinPoet
import io.spine.dependency.boms.BomsPlugin
import io.spine.dependency.local.Base
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.Compiler
import io.spine.dependency.local.Reflect
@@ -133,7 +133,7 @@ allprojects {
KotlinPoet.lib,
Reflect.lib,
Base.lib,
- CoreJava.server,
+ CoreJvm.server,
Time.lib,
TestLib.lib,
ToolBase.lib,
@@ -200,6 +200,7 @@ subprojects {
resolutionStrategy {
force(
ToolBase.gradlePluginApi,
+ ToolBase.jvmTools,
Validation.runtime,
)
}
diff --git a/uuid/build.gradle.kts b/uuid/build.gradle.kts
index 5f70f9978f..245e5bd443 100644
--- a/uuid/build.gradle.kts
+++ b/uuid/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright 2024, TeamDev. All rights reserved.
+ * Copyright 2025, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
*/
import io.spine.dependency.local.Base
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.Compiler
import io.spine.dependency.local.Reflect
@@ -40,7 +40,7 @@ dependencies {
Base.lib,
Reflect.lib,
Logging.lib,
- CoreJava.server,
+ CoreJvm.server,
Compiler.jvm,
project(":base")
).forEach {
diff --git a/version.gradle.kts b/version.gradle.kts
index 43651824f7..a7b7494839 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -29,5 +29,5 @@
*
* Do not rename this property, as it is also used in the integration tests via its name.
*/
-val coreJvmCompilerVersion by extra("2.0.0-SNAPSHOT.007")
+val coreJvmCompilerVersion by extra("2.0.0-SNAPSHOT.008")
val versionToPublish by extra(coreJvmCompilerVersion)