From 90a4e78f169856168e7e975ad23346f73081d0c2 Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Thu, 25 Dec 2025 21:38:39 +0000 Subject: [PATCH] Bring updates from Validation and CoreJvm Compiler --- buildSrc/src/main/kotlin/BuildExtensions.kt | 2 ++ .../main/kotlin/io/spine/dependency/lib/Protobuf.kt | 2 +- .../src/main/kotlin/io/spine/dependency/local/Base.kt | 4 ++-- .../main/kotlin/io/spine/dependency/local/BaseTypes.kt | 2 +- .../main/kotlin/io/spine/dependency/local/Change.kt | 2 +- .../main/kotlin/io/spine/dependency/local/Compiler.kt | 4 ++-- .../main/kotlin/io/spine/dependency/local/CoreJvm.kt | 2 +- .../io/spine/dependency/local/CoreJvmCompiler.kt | 10 +++------- .../src/main/kotlin/io/spine/dependency/local/Time.kt | 2 +- .../kotlin/io/spine/dependency/local/Validation.kt | 5 ++++- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt index 4122975f..f7a11e3e 100644 --- a/buildSrc/src/main/kotlin/BuildExtensions.kt +++ b/buildSrc/src/main/kotlin/BuildExtensions.kt @@ -227,6 +227,8 @@ fun Project.configureTaskDependencies() { "compileTestFixturesKotlin".dependOn("kspTestFixturesKotlin") "javadocJar".dependOn(dokkaGeneratePublicationJavadoc) "htmlDocsJar".dependOn(dokkaGenerate) + + "kspTestKotlin".dependOn("launchTestSpineCompiler") } } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt b/buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt index 24e3bd6d..4889ea12 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt @@ -33,7 +33,7 @@ package io.spine.dependency.lib ) object Protobuf { const val group = "com.google.protobuf" - const val version = "4.33.1" + const val version = "4.33.2" /** * The Java library with Protobuf data types. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt index af6c4009..38346ab0 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt @@ -33,8 +33,8 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName", "unused") object Base { - const val version = "2.0.0-SNAPSHOT.383" - const val versionForBuildScript = "2.0.0-SNAPSHOT.383" + const val version = "2.0.0-SNAPSHOT.384" + const val versionForBuildScript = "2.0.0-SNAPSHOT.384" const val group = Spine.group private const val prefix = "spine" const val libModule = "$prefix-base" diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt index 23c7da75..8328e403 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt @@ -33,7 +33,7 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName") object BaseTypes { - const val version = "2.0.0-SNAPSHOT.212" + const val version = "2.0.0-SNAPSHOT.222" const val group = Spine.group const val artifact = "spine-base-types" const val lib = "$group:$artifact:$version" diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt index 24365800..dbde1935 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt @@ -33,7 +33,7 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName") object Change { - const val version = "2.0.0-SNAPSHOT.200" + const val version = "2.0.0-SNAPSHOT.205" const val group = Spine.group const val artifact = "spine-change" const val lib = "$group:$artifact:$version" diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt index c3ca6738..febf8ae9 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt @@ -72,7 +72,7 @@ object Compiler : Dependency() { * The version of the Compiler dependencies. */ override val version: String - private const val fallbackVersion = "2.0.0-SNAPSHOT.035" + private const val fallbackVersion = "2.0.0-SNAPSHOT.037" /** * The distinct version of the Compiler used by other build tools. @@ -81,7 +81,7 @@ object Compiler : Dependency() { * transitive dependencies, this is the version used to build the project itself. */ val dogfoodingVersion: String - private const val fallbackDfVersion = "2.0.0-SNAPSHOT.035" + private const val fallbackDfVersion = "2.0.0-SNAPSHOT.037" /** * The artifact for the Compiler Gradle plugin. 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 2e224754..a6a93f0b 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt @@ -39,7 +39,7 @@ typealias CoreJava = CoreJvm @Suppress("ConstPropertyName", "unused") object CoreJvm { const val group = Spine.group - const val version = "2.0.0-SNAPSHOT.358" + const val version = "2.0.0-SNAPSHOT.370" const val coreArtifact = "spine-core" const val clientArtifact = "spine-client" 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 f077f612..2737c39c 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt @@ -26,14 +26,10 @@ package io.spine.dependency.local -import io.spine.dependency.local.CoreJvmCompiler.dogfoodingVersion -import io.spine.dependency.local.CoreJvmCompiler.version - - /** * Dependencies on the CoreJvm Compiler artifacts. * - * See [mc-java](https://github.com/SpineEventEngine/core-jvm-compiler). + * See [CoreJvm Compiler](https://github.com/SpineEventEngine/core-jvm-compiler). */ @Suppress( "MemberVisibilityCanBePrivate" /* `pluginLib()` is used by subprojects. */, @@ -50,12 +46,12 @@ object CoreJvmCompiler { /** * The version used to in the build classpath. */ - const val dogfoodingVersion = "2.0.0-SNAPSHOT.042" + const val dogfoodingVersion = "2.0.0-SNAPSHOT.050" /** * The version to be used for integration tests. */ - const val version = "2.0.0-SNAPSHOT.042" + const val version = "2.0.0-SNAPSHOT.050" /** * The ID of the Gradle plugin. 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 4bfe22cd..899c48f8 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt @@ -33,7 +33,7 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName") object Time { - const val version = "2.0.0-SNAPSHOT.220" + const val version = "2.0.0-SNAPSHOT.230" const val group = Spine.group const val artifact = "spine-time" const val lib = "$group:$artifact:$version" diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt index 92a71d79..7cf8dd68 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt @@ -36,7 +36,7 @@ object Validation { /** * The version of the Validation library artifacts. */ - const val version = "2.0.0-SNAPSHOT.378" + const val version = "2.0.0-SNAPSHOT.391" /** * The last version of Validation compatible with ProtoData. @@ -53,6 +53,9 @@ object Validation { fun runtime(version: String) = "$runtimeModule:$version" val runtime = runtime(version) + @Deprecated("Use `runtime` instead.", ReplaceWith("runtime")) + const val oldRuntime = "io.spine.validation:spine-validation-java-runtime:2.0.0-SNAPSHOT.354" + const val javaModule = "$group:$prefix-java" const val java = "$javaModule:$version" const val javaBundleModule = "$group:$prefix-java-bundle"