Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 7 additions & 37 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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")

Expand All @@ -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,
Expand All @@ -159,11 +150,10 @@ allprojects {
Base.lib,
Base.annotations,
Validation.runtime,
Validation.oldRuntime,
Validation.javaBundle,
Logging.lib,
CoreJvm.server,
protocArtifact
Protobuf.compiler
)
}
}
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/BuildExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ fun Project.configureTaskDependencies() {
"compileTestFixturesKotlin".dependOn("kspTestFixturesKotlin")
"javadocJar".dependOn(dokkaGeneratePublicationJavadoc)
"htmlDocsJar".dependOn(dokkaGenerate)

"kspTestKotlin".dependOn("launchTestSpineCompiler")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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. */,
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
36 changes: 10 additions & 26 deletions dependencies.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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)

Expand All @@ -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)
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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).
3 changes: 3 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading