From 32ed27d49fa40c419e3351537b20535d3886ea89 Mon Sep 17 00:00:00 2001
From: alexander-yevsyukov <alexander.yevsyukov@teamdev.com>
Date: Fri, 10 Oct 2025 19:18:47 +0100
Subject: [PATCH 1/3] Bump embedded Kotlin for `buildSrc`

---
 .idea/kotlinc.xml         | 6 +++---
 buildSrc/build.gradle.kts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 0dbadfe8f..0a2d98b94 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,10 +4,10 @@
     <option name="jvmTarget" value="17" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="1.8" />
-    <option name="languageVersion" value="1.8" />
+    <option name="apiVersion" value="2.2" />
+    <option name="languageVersion" value="2.2" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.21" />
+    <option name="version" value="2.2.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9b12dfb4c..404803933 100644
--- a/buildSrc/build.gradle.kts
+++ b/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.21"
+val kotlinEmbeddedVersion = "2.2.20"
 
 /**
  * The version of Guava used in `buildSrc`.

From f293cea4f25701d98a45d92567dc571c65eb91bd Mon Sep 17 00:00:00 2001
From: alexander-yevsyukov <alexander.yevsyukov@teamdev.com>
Date: Sun, 12 Oct 2025 19:16:12 +0100
Subject: [PATCH 2/3] Bump Shadow Gradle plugin -> `9.2.2`

---
 buildSrc/build.gradle.kts                                       | 2 +-
 .../src/main/kotlin/io/spine/gradle/publish/ShadowJarExts.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 404803933..5b08359cd 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -144,7 +144,7 @@ val koverVersion = "0.9.1"
  *
  * @see <a href="https://github.com/GradleUp/shadow">Shadow Plugin releases</a>
  */
-val shadowVersion = "8.3.6"
+val shadowVersion = "9.2.2"
 
 configurations.all {
     resolutionStrategy {
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/ShadowJarExts.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/ShadowJarExts.kt
index e2e67e042..87157fdf6 100644
--- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/ShadowJarExts.kt
+++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/ShadowJarExts.kt
@@ -33,7 +33,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
  */
 fun ShadowJar.handleMergingServiceFiles() {
     ServiceFiles.all.forEach {
-        mergeServiceFiles(it)
+        append(it)
     }
 }
 

From 1e5c9716e2cf1b0a72f7d071d8e35b4689d7c400 Mon Sep 17 00:00:00 2001
From: alexander-yevsyukov <alexander.yevsyukov@teamdev.com>
Date: Sun, 12 Oct 2025 19:16:38 +0100
Subject: [PATCH 3/3] Bump local dependencies

---
 buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt    | 4 ++--
 .../src/main/kotlin/io/spine/dependency/local/Compiler.kt     | 4 ++--
 buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt | 2 +-
 .../src/main/kotlin/io/spine/dependency/local/ToolBase.kt     | 3 ++-
 .../src/main/kotlin/io/spine/dependency/local/Validation.kt   | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

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 b8351d98c..ff45fc8ce 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.361"
-    const val versionForBuildScript = "2.0.0-SNAPSHOT.361"
+    const val version = "2.0.0-SNAPSHOT.362"
+    const val versionForBuildScript = "2.0.0-SNAPSHOT.362"
     const val group = Spine.group
     const val artifact = "spine-base"
     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 708dd6bc5..522df4d4b 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt
@@ -70,7 +70,7 @@ object Compiler {
      * The version of ProtoData dependencies.
      */
     val version: String
-    private const val fallbackVersion = "2.0.0-SNAPSHOT.024"
+    private const val fallbackVersion = "2.0.0-SNAPSHOT.026"
 
     /**
      * The distinct version of ProtoData used by other build tools.
@@ -79,7 +79,7 @@ object Compiler {
      * transitional dependencies, this is the version used to build the project itself.
      */
     val dogfoodingVersion: String
-    private const val fallbackDfVersion = "2.0.0-SNAPSHOT.024"
+    private const val fallbackDfVersion = "2.0.0-SNAPSHOT.026"
 
     /**
      * The artifact for the ProtoData Gradle plugin.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
index f9754bbbe..d3fe7c693 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
@@ -33,7 +33,7 @@ package io.spine.dependency.local
  */
 @Suppress("ConstPropertyName")
 object TestLib {
-    const val version = "2.0.0-SNAPSHOT.210"
+    const val version = "2.0.0-SNAPSHOT.211"
     const val group = Spine.toolsGroup
     const val artifact = "spine-testlib"
     const val lib = "$group:$artifact:$version"
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
index 69e7bea9e..f9f77fec2 100644
--- a/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
+++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
@@ -45,7 +45,8 @@ object ToolBase {
     const val intellijPlatformJava = "$group:intellij-platform-java:$version"
 
     const val psi = "$group:psi:$version"
-    const val psiJava = "$group:psi-java:$version"
+    const val psiJavaArtifactName = "psi-java"
+    const val psiJava = "$group:$psiJavaArtifactName:$version"
 
     const val gradleRootPlugin = "$group:gradle-root-plugin:$version"
     const val gradlePluginApi = "$group:gradle-plugin-api:$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 e84228372..cf601a641 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.351"
+    const val version = "2.0.0-SNAPSHOT.352"
 
     /**
      * The last version of Validation compatible with ProtoData.