diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index c1361ab..f12916d 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -8,7 +8,6 @@
-
-
\ No newline at end of file
+
diff --git a/build.gradle.kts b/build.gradle.kts
index 4ed8383..3649c43 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,17 +27,16 @@
@file:Suppress("RemoveRedundantQualifierName")
import com.google.protobuf.gradle.id
-import io.spine.dependency.build.Dokka
import io.spine.dependency.build.ErrorProne
import io.spine.dependency.kotlinx.Coroutines
import io.spine.dependency.lib.Grpc
import io.spine.dependency.lib.Jackson
import io.spine.dependency.lib.Kotlin
import io.spine.dependency.lib.KotlinPoet
+import io.spine.dependency.lib.Protobuf
import io.spine.dependency.local.Base
import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
-import io.spine.dependency.local.ProtoData
import io.spine.dependency.local.ToolBase
import io.spine.dependency.local.Validation
import io.spine.gradle.checkstyle.CheckStyleConfig
@@ -53,8 +52,6 @@ import io.spine.gradle.repo.standardToSpineSdk
import io.spine.gradle.report.coverage.JacocoConfig
import io.spine.gradle.report.license.LicenseReporter
import io.spine.gradle.report.pom.PomGenerator
-import io.spine.gradle.testing.configureLogging
-import io.spine.gradle.testing.registerTestTasks
buildscript {
standardSpineSdkRepositories()
@@ -87,7 +84,6 @@ buildscript {
base.annotations,
base.lib,
validation.runtime,
- validation.oldRuntime,
logging.lib,
io.spine.dependency.local.Time.lib,
io.spine.dependency.local.Time.javaExtensions,
@@ -123,12 +119,6 @@ spinePublishing {
}
}
-// Temporarily use this version, since 3.21.x is known to provide
-// a broken `protoc-gen-js` artifact and Kotlin code without access modifiers.
-// See https://github.com/protocolbuffers/protobuf-javascript/issues/127.
-// https://github.com/protocolbuffers/protobuf/issues/10593
-val protocArtifact = "com.google.protobuf:protoc:3.19.6"
-
allprojects {
apply(from = "$rootDir/version.gradle.kts")
@@ -145,11 +135,12 @@ allprojects {
Kotlin.StdLib.forceArtifacts(project, cfg, rs)
Kotlin.forceArtifacts(project, cfg, rs)
Coroutines.forceArtifacts(project, cfg, rs)
- Jackson.forceArtifacts(project, this@all, this@resolutionStrategy)
- Jackson.DataType.forceArtifacts(project, this@all, this@resolutionStrategy)
- Jackson.DataFormat.forceArtifacts(project, this@all, this@resolutionStrategy)
- Grpc.forceArtifacts(project, this@all, this@resolutionStrategy)
+ Jackson.forceArtifacts(project, cfg, rs)
+ Jackson.DataType.forceArtifacts(project, cfg, rs)
+ Jackson.DataFormat.forceArtifacts(project, cfg, rs)
+ Grpc.forceArtifacts(project, cfg, rs)
force(
+ Protobuf.javaLib,
Jackson.annotations,
Jackson.bom,
Grpc.bom,
@@ -159,11 +150,10 @@ allprojects {
Base.lib,
Base.annotations,
Validation.runtime,
- Validation.oldRuntime,
Validation.javaBundle,
Logging.lib,
CoreJvm.server,
- protocArtifact
+ Protobuf.compiler
)
}
}
@@ -224,26 +214,6 @@ subprojects {
JavadocConfig.applyTo(project)
CheckStyleConfig.applyTo(project)
- protobuf {
- protoc {
- // Temporarily use this version, since 3.21.x is known to provide
- // a broken `protoc-gen-js` artifact.
- // See https://github.com/protocolbuffers/protobuf-javascript/issues/127.
- //
- // Once it is addressed, this artifact should be `Protobuf.compiler`.
- artifact = protocArtifact
- }
- generateProtoTasks {
- all().forEach { task ->
- task.builtins {
- id("js") {
- option("library=spine-change-${project.version}")
- }
- }
- }
- }
- }
-
updateGitHubPages() {
rootFolder.set(rootDir)
}
diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt
index 4122975..f7a11e3 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 24e3bd6..4889ea1 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 af6c400..38346ab 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 23c7da7..2714738 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.223"
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 2436580..dbde193 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 c3ca673..febf8ae 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 2e22475..a6a93f0 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 f077f61..2737c39 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 4bfe22c..899c48f 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 890eddd..7cf8dd6 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.383"
+ const val version = "2.0.0-SNAPSHOT.391"
/**
* The last version of Validation compatible with ProtoData.
diff --git a/config b/config
index 9a4fbe2..dcd2cee 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit 9a4fbe2bcae9a7b5f0d20159d41a8756d236e146
+Subproject commit dcd2cee3af82ce8e4de407801636637f7cdcef3c
diff --git a/dependencies.md b/dependencies.md
index edc85cd..7368e39 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -1,6 +1,6 @@
-# Dependencies of `io.spine:spine-change:2.0.0-SNAPSHOT.205`
+# Dependencies of `io.spine:spine-change:2.0.0-SNAPSHOT.206`
## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -30,15 +30,15 @@
* **Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
* **License:** [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 4.33.1.
+1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
-1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 4.33.1.
+1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
-1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 4.33.1.
+1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
@@ -58,26 +58,10 @@
* **Project URL:** [https://kotlinlang.org/](https://kotlinlang.org/)
* **License:** [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-1. **Group** : org.jetbrains.kotlinx. **Name** : atomicfu. **Version** : 0.29.0.
- * **Project URL:** [https://github.com/Kotlin/kotlinx.atomicfu](https://github.com/Kotlin/kotlinx.atomicfu)
- * **License:** [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
-1. **Group** : org.jetbrains.kotlinx. **Name** : atomicfu-jvm. **Version** : 0.29.0.
- * **Project URL:** [https://github.com/Kotlin/kotlinx.atomicfu](https://github.com/Kotlin/kotlinx.atomicfu)
- * **License:** [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
1. **Group** : org.jetbrains.kotlinx. **Name** : kotlinx-coroutines-bom. **Version** : 1.10.2.
* **Project URL:** [https://github.com/Kotlin/kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines)
* **License:** [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-1. **Group** : org.jetbrains.kotlinx. **Name** : kotlinx-datetime. **Version** : 0.7.1.
- * **Project URL:** [https://github.com/Kotlin/kotlinx-datetime](https://github.com/Kotlin/kotlinx-datetime)
- * **License:** [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
-1. **Group** : org.jetbrains.kotlinx. **Name** : kotlinx-datetime-jvm. **Version** : 0.7.1.
- * **Project URL:** [https://github.com/Kotlin/kotlinx-datetime](https://github.com/Kotlin/kotlinx-datetime)
- * **License:** [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
1. **Group** : org.jspecify. **Name** : jspecify. **Version** : 1.0.0.
* **Project URL:** [http://jspecify.org/](http://jspecify.org/)
* **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -271,21 +255,21 @@
* **Project URL:** [https://github.com/google/protobuf-gradle-plugin](https://github.com/google/protobuf-gradle-plugin)
* **License:** [BSD 3-Clause](http://opensource.org/licenses/BSD-3-Clause)
-1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 4.33.1.
+1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
-1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 4.33.1.
+1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
-1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 4.33.1.
+1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
-1. **Group** : com.google.protobuf. **Name** : protoc. **Version** : 3.19.6.
+1. **Group** : com.google.protobuf. **Name** : protoc. **Version** : 4.33.2.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
- * **License:** [3-Clause BSD License](https://opensource.org/licenses/BSD-3-Clause)
+ * **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
* **License:** [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
1. **Group** : com.google.truth. **Name** : truth. **Version** : 1.4.4.
@@ -1005,6 +989,6 @@
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
-This report was generated on **Mon Dec 22 19:25:55 WET 2025** using
+This report was generated on **Fri Dec 26 16:19:59 WET 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
diff --git a/gradlew b/gradlew
index adff685..2fa0b7c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,8 @@
#!/bin/sh
+# Temporarily disable the runtime check of Protobuf version compatibility.
+export TEMPORARILY_DISABLE_PROTOBUF_VERSION_CHECK=true
+
#
# Copyright © 2015 the original authors.
#
diff --git a/gradlew.bat b/gradlew.bat
index c4bdd3a..c7f1ffa 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -16,6 +16,9 @@
@rem SPDX-License-Identifier: Apache-2.0
@rem
+@rem Temporarily disable the runtime check of Protobuf version compatibility.
+set TEMPORARILY_DISABLE_PROTOBUF_VERSION_CHECK=true
+
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
diff --git a/pom.xml b/pom.xml
index 72cc3ad..da6c687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
-->
io.spine
spine-change
-2.0.0-SNAPSHOT.205
+2.0.0-SNAPSHOT.206
2015
@@ -26,13 +26,13 @@ all modules and does not describe the project structure per-subproject.
io.spine
spine-base
- 2.0.0-SNAPSHOT.383
+ 2.0.0-SNAPSHOT.384
compile
io.spine
spine-validation-jvm-runtime
- 2.0.0-SNAPSHOT.383
+ 2.0.0-SNAPSHOT.391
compile
@@ -62,7 +62,7 @@ all modules and does not describe the project structure per-subproject.
io.spine.tools
spine-time-testlib
- 2.0.0-SNAPSHOT.220
+ 2.0.0-SNAPSHOT.230
test
@@ -119,7 +119,7 @@ all modules and does not describe the project structure per-subproject.
com.google.protobuf
protoc
- 3.19.6
+ 4.33.2
com.puppycrawl.tools
@@ -139,22 +139,22 @@ all modules and does not describe the project structure per-subproject.
io.spine.tools
compiler-cli-all
- 2.0.0-SNAPSHOT.035
+ 2.0.0-SNAPSHOT.037
io.spine.tools
compiler-protoc-plugin
- 2.0.0-SNAPSHOT.035
+ 2.0.0-SNAPSHOT.037
io.spine.tools
core-jvm-gradle-plugins
- 2.0.0-SNAPSHOT.042
+ 2.0.0-SNAPSHOT.050
io.spine.tools
core-jvm-routing
- 2.0.0-SNAPSHOT.042
+ 2.0.0-SNAPSHOT.050
io.spine.tools
@@ -164,7 +164,7 @@ all modules and does not describe the project structure per-subproject.
io.spine.tools
validation-java-bundle
- 2.0.0-SNAPSHOT.383
+ 2.0.0-SNAPSHOT.391
net.sourceforge.pmd
diff --git a/version.gradle.kts b/version.gradle.kts
index 3f3af8d..98e99ac 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -29,4 +29,4 @@
*
* For dependencies on Spine modules please see [io.spine.dependency.local.Spine].
*/
-val versionToPublish by extra("2.0.0-SNAPSHOT.205")
+val versionToPublish by extra("2.0.0-SNAPSHOT.206")