Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
033857c
Update `config`
alexander-yevsyukov May 15, 2025
8cbc13e
Bump verison -> `0.96.0`
alexander-yevsyukov May 15, 2025
24c056c
Force `Time` version
alexander-yevsyukov May 15, 2025
21ee059
Address deprecations
alexander-yevsyukov May 15, 2025
2bdc1ce
Bump Protobuf -> `4.31.0`
alexander-yevsyukov May 15, 2025
ef14402
Update local dependencies
alexander-yevsyukov May 15, 2025
e6cc75c
Force Protobuf library version
alexander-yevsyukov May 15, 2025
1762343
Exclude directories under `/tests/`
alexander-yevsyukov May 16, 2025
42e082e
Derive `Ksp` from `Dependency`
alexander-yevsyukov May 16, 2025
765493d
Bump Validation -> `2.0.0-SNAPSHOT.335`
alexander-yevsyukov May 16, 2025
6278b5d
Force KSP artifacts
alexander-yevsyukov May 16, 2025
a3205b1
Add `ScriptHandlerScope.protobuf` extension
alexander-yevsyukov May 16, 2025
ce2273c
Remove forcing previous `Base` version
alexander-yevsyukov May 16, 2025
6bd90da
Force `Kotlin.bom`
alexander-yevsyukov May 16, 2025
a020d11
Update dependency reports
alexander-yevsyukov May 16, 2025
9651adf
Force KSP Gradle Plugin
alexander-yevsyukov May 16, 2025
009603e
Update dependency reports
alexander-yevsyukov May 16, 2025
d744329
Restore `.gitignore` as it was
alexander-yevsyukov May 16, 2025
3b6c2f0
Revert duplicating changes
alexander-yevsyukov May 16, 2025
fe76123
Merge remote-tracking branch 'origin/master' into bump-dependencies
alexander-yevsyukov May 16, 2025
0176c4f
Enable parallel Gradle build
alexander-yevsyukov May 16, 2025
2c27967
Enable parallel Gradle build
alexander-yevsyukov May 16, 2025
ec1984b
Remove installation workflow
alexander-yevsyukov May 17, 2025
82623c8
Update build time
alexander-yevsyukov May 17, 2025
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
35 changes: 0 additions & 35 deletions .github/workflows/installation.yml

This file was deleted.

3 changes: 1 addition & 2 deletions api/src/main/kotlin/io/spine/protodata/ast/OptionExts.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ import com.google.protobuf.Descriptors.GenericDescriptor
import com.google.protobuf.Descriptors.MethodDescriptor
import com.google.protobuf.Descriptors.OneofDescriptor
import com.google.protobuf.Descriptors.ServiceDescriptor
import com.google.protobuf.GeneratedMessage.GeneratedExtension
import com.google.protobuf.GeneratedMessageV3.ExtendableMessage
import com.google.protobuf.GeneratedMessage.ExtendableMessage
import com.google.protobuf.Message
import io.spine.base.EventMessage
import io.spine.option.OptionsProto
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ buildscript {
val baseForBuildScript = io.spine.dependency.local.Base.libForBuildScript
dependencies {
classpath(io.spine.dependency.lib.Protobuf.GradlePlugin.lib)
classpath(io.spine.dependency.build.Ksp.run { artifact(gradlePlugin) })
classpath(baseForBuildScript)
classpath(mcJava.pluginLib) {
excludeSpineBase()
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ val grGitVersion = "4.1.1"
* This version may change from the [version of Kotlin][io.spine.dependency.lib.Kotlin.version]
* used by the project.
*/
val kotlinEmbeddedVersion = "2.1.20"
val kotlinEmbeddedVersion = "2.1.21"

/**
* The version of Guava used in `buildSrc`.
Expand Down Expand Up @@ -103,7 +103,7 @@ val errorPronePluginVersion = "4.2.0"
* @see <a href="https://github.com/google/protobuf-gradle-plugin/releases">
* Protobuf Gradle Plugins Releases</a>
*/
val protobufPluginVersion = "0.9.4"
val protobufPluginVersion = "0.9.5"

/**
* The version of Dokka Gradle Plugins.
Expand Down
6 changes: 6 additions & 0 deletions buildSrc/src/main/kotlin/BuildExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ fun ScriptHandlerScope.standardSpineSdkRepositories() {
repositories.standardToSpineSdk()
}

/**
* Shortcut to [Protobuf] dependency object for using under `buildScript`.
*/
val ScriptHandlerScope.protobuf: Protobuf
get() = Protobuf

/**
* Shortcut to [McJava] dependency object for using under `buildScript`.
*/
Expand Down
30 changes: 21 additions & 9 deletions buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,31 @@

package io.spine.dependency.build

import io.spine.dependency.Dependency

/**
* Kotlin Symbol Processing API.
*
* @see <a href="https://github.com/google/ksp">KSP GitHub repository</a>
*/
@Suppress("ConstPropertyName", "unused")
object Ksp {
const val version = "2.1.20-2.0.0"
@Suppress("unused")
object Ksp : Dependency() {
override val version = "2.1.21-2.0.1"
override val group = "com.google.devtools.ksp"

const val id = "com.google.devtools.ksp"
const val group = "com.google.devtools.ksp"
const val symbolProcessingApi = "$group:symbol-processing-api:$version"
const val symbolProcessing = "$group:symbol-processing:$version"
const val symbolProcessingAaEmb = "$group:symbol-processing-aa-embeddable:$version"
const val symbolProcessingCommonDeps = "$group:symbol-processing-common-deps:$version"
const val gradlePlugin = "$group:symbol-processing-gradle-plugin:$version"

val symbolProcessingApi = "$group:symbol-processing-api"
val symbolProcessing = "$group:symbol-processing"
val symbolProcessingAaEmb = "$group:symbol-processing-aa-embeddable"
val symbolProcessingCommonDeps = "$group:symbol-processing-common-deps"
val gradlePlugin = "$group:symbol-processing-gradle-plugin"

override val modules = listOf(
symbolProcessingApi,
symbolProcessing,
symbolProcessingAaEmb,
symbolProcessingCommonDeps,
gradlePlugin,
)
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object Kotlin : DependencyWithBom() {
* depend on Gradle and the version of embedded Kotlin.
*/
@Suppress("MemberVisibilityCanBePrivate") // used directly from the outside.
const val runtimeVersion = "2.1.20"
const val runtimeVersion = "2.1.21"

override val version = runtimeVersion
override val group = "org.jetbrains.kotlin"
Expand All @@ -49,7 +49,7 @@ object Kotlin : DependencyWithBom() {
* This is the version of
* [Kotlin embedded into Gradle](https://docs.gradle.org/current/userguide/compatibility.html#kotlin).
*/
const val embeddedVersion = "2.1.20"
const val embeddedVersion = "2.1.21"

/**
* The version of the JetBrains annotations library, which is a transitive
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 = "3.25.7"
const val version = "4.31.0"

/**
* 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")
object Base {
const val version = "2.0.0-SNAPSHOT.318"
const val versionForBuildScript = "2.0.0-SNAPSHOT.318"
const val version = "2.0.0-SNAPSHOT.320"
const val versionForBuildScript = "2.0.0-SNAPSHOT.317"
const val group = Spine.group
const val artifact = "spine-base"
const val lib = "$group:$artifact:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object CoreJava {
const val group = Spine.group
const val version = "2.0.0-SNAPSHOT.313"
const val version = "2.0.0-SNAPSHOT.314"

const val coreArtifact = "spine-core"
const val clientArtifact = "spine-client"
Expand Down
7 changes: 2 additions & 5 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@

package io.spine.dependency.local

import io.spine.dependency.local.McJava.dogfoodingVersion
import io.spine.dependency.local.McJava.version

/**
* Dependencies on Spine Model Compiler for Java.
*
Expand All @@ -45,12 +42,12 @@ object McJava {
/**
* The version used to in the build classpath.
*/
const val dogfoodingVersion = "2.0.0-SNAPSHOT.310"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.311"

/**
* The version to be used for integration tests.
*/
const val version = "2.0.0-SNAPSHOT.310"
const val version = "2.0.0-SNAPSHOT.311"

/**
* The ID of the Gradle plugin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ object ProtoData {
* The version of ProtoData dependencies.
*/
val version: String
private const val fallbackVersion = "0.94.0"
private const val fallbackVersion = "0.95.0"

/**
* The distinct version of ProtoData used by other build tools.
Expand All @@ -81,7 +81,7 @@ object ProtoData {
* transitional dependencies, this is the version used to build the project itself.
*/
val dogfoodingVersion: String
private const val fallbackDfVersion = "0.94.0"
private const val fallbackDfVersion = "0.95.0"

/**
* The artifact for the ProtoData 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.202"
const val version = "2.0.0-SNAPSHOT.203"
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 @@ -34,7 +34,7 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object ToolBase {
const val group = Spine.toolsGroup
const val version = "2.0.0-SNAPSHOT.321"
const val version = "2.0.0-SNAPSHOT.330"

const val lib = "$group:spine-tool-base:$version"
const val pluginBase = "$group:spine-plugin-base:$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.332"
const val version = "2.0.0-SNAPSHOT.335"

const val group = "io.spine.validation"
private const val prefix = "spine-validation"
Expand Down
5 changes: 5 additions & 0 deletions buildSrc/src/main/kotlin/module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@

import io.spine.dependency.build.Dokka
import io.spine.dependency.build.ErrorProne
import io.spine.dependency.build.Ksp
import io.spine.dependency.lib.Protobuf
import io.spine.dependency.local.Base
import io.spine.dependency.local.Time
import io.spine.dependency.local.ToolBase
import io.spine.dependency.local.Validation
import io.spine.gradle.javac.configureErrorProne
Expand Down Expand Up @@ -84,9 +86,12 @@ fun Module.setDependencies() {
fun Module.forceConfigurations() {
configurations.all {
resolutionStrategy {
Ksp.forceArtifacts(project, this@all, this@resolutionStrategy)
force(
Protobuf.javaLib,
Protobuf.compiler,
Base.lib,
Time.lib,
ToolBase.lib,
Validation.runtime,
)
Expand Down
Loading
Loading