Merge pull request #198 from SpineEventEngine/bump-protobuf-etc

Bump Protobuf and other dependencies

Author: alexander-yevsyukov

.gitignore

@@ -55,19 +55,28 @@
 !.idea/codeStyles/
 !.idea/copyright/
 
+# Ignore IDEA config files under `tests`
+/tests/.idea/**
+
 # Gradle interim configs
 **/.gradle/**
 
 # Temp directory for Gradle TestKit runners
 **/.gradle-test-kit/**
 
+# Integration test log files
+/tests/_out/**
+
 # Generated source code
 **/generated/**
 **/*.pb.dart
 **/*.pbenum.dart
 **/*.pbserver.dart
 **/*.pbjson.dart
 
+# Generated source code with custom path under `tests`
+/tests/**/proto-gen/**
+
 # Gradle build files
 **/build/**
 !**/src/**/build/**

build.gradle.kts

@@ -54,9 +54,17 @@ buildscript {
     configurations {
         all {
             exclude(group = "io.spine", module = "spine-logging-backend")
-
             resolutionStrategy {
+                val configuration = this@all
+                val strategy = this@resolutionStrategy
+                io.spine.dependency.build.Ksp
+                    .forceArtifacts(project, configuration, strategy)
+                io.spine.dependency.lib.Kotlin
+                    .forceArtifacts(project, configuration, strategy)
+                io.spine.dependency.lib.Kotlin.StdLib
+                    .forceArtifacts(project, configuration, strategy)
                 force(
+                    io.spine.dependency.lib.Kotlin.bom,
                     io.spine.dependency.local.Base.libForBuildScript,
                     io.spine.dependency.local.Reflect.lib,
                     toolBase.lib,
@@ -72,9 +80,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath(mcJava.pluginLib)
         classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
         classpath(enforcedPlatform(io.spine.dependency.lib.Grpc.bom))
+        classpath(mcJava.pluginLib)
     }
 }
 

buildSrc/build.gradle.kts

@@ -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`.
@@ -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.

buildSrc/src/main/kotlin/BuildExtensions.kt

@@ -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`.
  */

buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt

@@ -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,
+    )
 }

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

@@ -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"
@@ -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

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 = "3.25.7"
+    const val version = "4.31.0"
 
     /**
      * The Java library with Protobuf data types.

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

@@ -33,7 +33,7 @@ package io.spine.dependency.local
  */
 @Suppress("ConstPropertyName")
 object Base {
-    const val version = "2.0.0-SNAPSHOT.317"
+    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"

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.200"
+    const val version = "2.0.0-SNAPSHOT.210"
     const val group = Spine.group
     const val artifact = "spine-base-types"
     const val lib = "$group:$artifact:$version"

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

@@ -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.316"
 
     const val coreArtifact = "spine-core"
     const val clientArtifact = "spine-client"