Skip to content

Commit dcd2cee

Browse files
Merge pull request #620 from SpineEventEngine/update-from-validation-and-core-jvm
Bring updates from Validation and CoreJvm Compiler
2 parents 9a4fbe2 + 90a4e78 commit dcd2cee

10 files changed

Lines changed: 18 additions & 17 deletions

File tree

buildSrc/src/main/kotlin/BuildExtensions.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ fun Project.configureTaskDependencies() {
227227
"compileTestFixturesKotlin".dependOn("kspTestFixturesKotlin")
228228
"javadocJar".dependOn(dokkaGeneratePublicationJavadoc)
229229
"htmlDocsJar".dependOn(dokkaGenerate)
230+
231+
"kspTestKotlin".dependOn("launchTestSpineCompiler")
230232
}
231233
}
232234

buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.lib
3333
)
3434
object Protobuf {
3535
const val group = "com.google.protobuf"
36-
const val version = "4.33.1"
36+
const val version = "4.33.2"
3737

3838
/**
3939
* The Java library with Protobuf data types.

buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName", "unused")
3535
object Base {
36-
const val version = "2.0.0-SNAPSHOT.383"
37-
const val versionForBuildScript = "2.0.0-SNAPSHOT.383"
36+
const val version = "2.0.0-SNAPSHOT.384"
37+
const val versionForBuildScript = "2.0.0-SNAPSHOT.384"
3838
const val group = Spine.group
3939
private const val prefix = "spine"
4040
const val libModule = "$prefix-base"

buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName")
3535
object BaseTypes {
36-
const val version = "2.0.0-SNAPSHOT.212"
36+
const val version = "2.0.0-SNAPSHOT.222"
3737
const val group = Spine.group
3838
const val artifact = "spine-base-types"
3939
const val lib = "$group:$artifact:$version"

buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName")
3535
object Change {
36-
const val version = "2.0.0-SNAPSHOT.200"
36+
const val version = "2.0.0-SNAPSHOT.205"
3737
const val group = Spine.group
3838
const val artifact = "spine-change"
3939
const val lib = "$group:$artifact:$version"

buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ object Compiler : Dependency() {
7272
* The version of the Compiler dependencies.
7373
*/
7474
override val version: String
75-
private const val fallbackVersion = "2.0.0-SNAPSHOT.035"
75+
private const val fallbackVersion = "2.0.0-SNAPSHOT.037"
7676

7777
/**
7878
* The distinct version of the Compiler used by other build tools.
@@ -81,7 +81,7 @@ object Compiler : Dependency() {
8181
* transitive dependencies, this is the version used to build the project itself.
8282
*/
8383
val dogfoodingVersion: String
84-
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.035"
84+
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.037"
8585

8686
/**
8787
* The artifact for the Compiler Gradle plugin.

buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ typealias CoreJava = CoreJvm
3939
@Suppress("ConstPropertyName", "unused")
4040
object CoreJvm {
4141
const val group = Spine.group
42-
const val version = "2.0.0-SNAPSHOT.358"
42+
const val version = "2.0.0-SNAPSHOT.370"
4343

4444
const val coreArtifact = "spine-core"
4545
const val clientArtifact = "spine-client"

buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,10 @@
2626

2727
package io.spine.dependency.local
2828

29-
import io.spine.dependency.local.CoreJvmCompiler.dogfoodingVersion
30-
import io.spine.dependency.local.CoreJvmCompiler.version
31-
32-
3329
/**
3430
* Dependencies on the CoreJvm Compiler artifacts.
3531
*
36-
* See [mc-java](https://github.com/SpineEventEngine/core-jvm-compiler).
32+
* See [CoreJvm Compiler](https://github.com/SpineEventEngine/core-jvm-compiler).
3733
*/
3834
@Suppress(
3935
"MemberVisibilityCanBePrivate" /* `pluginLib()` is used by subprojects. */,
@@ -50,12 +46,12 @@ object CoreJvmCompiler {
5046
/**
5147
* The version used to in the build classpath.
5248
*/
53-
const val dogfoodingVersion = "2.0.0-SNAPSHOT.042"
49+
const val dogfoodingVersion = "2.0.0-SNAPSHOT.050"
5450

5551
/**
5652
* The version to be used for integration tests.
5753
*/
58-
const val version = "2.0.0-SNAPSHOT.042"
54+
const val version = "2.0.0-SNAPSHOT.050"
5955

6056
/**
6157
* The ID of the Gradle plugin.

buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName")
3535
object Time {
36-
const val version = "2.0.0-SNAPSHOT.220"
36+
const val version = "2.0.0-SNAPSHOT.230"
3737
const val group = Spine.group
3838
const val artifact = "spine-time"
3939
const val lib = "$group:$artifact:$version"

buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Validation {
3636
/**
3737
* The version of the Validation library artifacts.
3838
*/
39-
const val version = "2.0.0-SNAPSHOT.378"
39+
const val version = "2.0.0-SNAPSHOT.391"
4040

4141
/**
4242
* The last version of Validation compatible with ProtoData.
@@ -53,6 +53,9 @@ object Validation {
5353
fun runtime(version: String) = "$runtimeModule:$version"
5454
val runtime = runtime(version)
5555

56+
@Deprecated("Use `runtime` instead.", ReplaceWith("runtime"))
57+
const val oldRuntime = "io.spine.validation:spine-validation-java-runtime:2.0.0-SNAPSHOT.354"
58+
5659
const val javaModule = "$group:$prefix-java"
5760
const val java = "$javaModule:$version"
5861
const val javaBundleModule = "$group:$prefix-java-bundle"

0 commit comments

Comments
 (0)