Bump local dependencies

Author: alexander-yevsyukov

base/build.gradle.kts

@@ -64,6 +64,7 @@ dependencies {
         Validation.configuration,
         ToolBase.classicCodegen,
         ToolBase.pluginBase,
+        ToolBase.protobufSetupPlugins,
         KotlinPoet.lib,
     )
     apiDeps.forEach {

base/src/main/kotlin/io/spine/tools/core/jvm/gradle/ProjectExts.kt

@@ -32,10 +32,8 @@ import io.spine.tools.code.SourceSetName
 import io.spine.tools.fs.DirectoryName
 import io.spine.tools.fs.DirectoryName.grpc
 import io.spine.tools.fs.DirectoryName.java
-import io.spine.tools.fs.DirectoryName.spine
 import io.spine.tools.gradle.project.sourceSet
-import io.spine.tools.gradle.protobuf.ProtobufDependencies.sourceSetExtensionName
-import io.spine.tools.gradle.protobuf.generated
+import io.spine.tools.protobuf.gradle.ProtobufDependencies.sourceSetExtensionName
 import io.spine.tools.java.fs.DefaultJavaPaths
 import io.spine.tools.gradle.lib.spineExtension
 import java.nio.file.Path
@@ -82,16 +80,3 @@ public val generatedJavaDirName: DirectoryName = java
  * The short name of the directory containing generated gRPC source code.
  */
 public val generatedGrpcDirName: DirectoryName = grpc
-
-/**
- * The short name of the directory containing generated rejections source code.
- */
-public val generatedRejectionsDirName: DirectoryName = spine
-
-/**
- * Obtains the directory with the rejection source code generated for the specified source set.
- */
-public fun Project.generatedRejectionsDir(ss: SourceSetName): Path =
-    generated(ss).resolve(generatedRejectionsDirName)
-
-private fun Path.resolve(dir: DirectoryName) = this.resolve(dir.value())

build.gradle.kts

@@ -88,7 +88,7 @@ buildscript {
     dependencies {
         classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
         classpath(enforcedPlatform(io.spine.dependency.lib.Grpc.bom))
-        classpath(io.spine.dependency.local.ToolBase.jvmToolPlugins)
+        classpath(io.spine.dependency.local.ToolBase.jvmToolPluginDogfooding)
         classpath(coreJvmCompiler.pluginLib)
     }
 }

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

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.026"
+    private const val fallbackVersion = "2.0.0-SNAPSHOT.028"
 
     /**
      * 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.026"
+    private const val fallbackDfVersion = "2.0.0-SNAPSHOT.028"
 
     /**
      * The artifact for the ProtoData Gradle plugin.

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

@@ -34,7 +34,8 @@ package io.spine.dependency.local
 @Suppress("ConstPropertyName", "unused")
 object ToolBase {
     const val group = Spine.toolsGroup
-    const val version = "2.0.0-SNAPSHOT.361"
+    const val version = "2.0.0-SNAPSHOT.366"
+    const val dogfoodingVersion = "2.0.0-SNAPSHOT.361"
 
     const val lib = "$group:tool-base:$version"
     const val classicCodegen = "$group:classic-codegen:$version"
@@ -48,12 +49,15 @@ object ToolBase {
     const val psiJavaArtifactName = "psi-java"
     const val psiJava = "$group:$psiJavaArtifactName:$version"
 
-    const val gradleRootPlugin = "$group:gradle-root-plugin:$version"
+    const val rootGradlePlugins = "$group:root-gradle-plugins:$version"
     const val gradlePluginApi = "$group:gradle-plugin-api:$version"
     const val gradlePluginApiTestFixtures = "$group:gradle-plugin-api-test-fixtures:$version"
 
     const val jvmTools = "$group:jvm-tools:$version"
-    const val jvmToolPlugins = "$group:jvm-tool-all-plugins:$version"
+    const val jvmToolPluginDogfooding = "$group:jvm-tool-all-plugins:$dogfoodingVersion"
+    const val jvmToolPlugins = "$group:jvm-tool-plugins-all:$version"
+
+    const val protobufSetupPlugins = "$group:protobuf-setup-plugins:$version"
 
     object JavadocFilter {
         const val group = ToolBase.group

buildSrc/src/main/kotlin/module.gradle.kts

@@ -161,11 +161,13 @@ fun Module.forceConfigurations() {
                     CoreJvm.server,
                     TestLib.lib,
                     ToolBase.lib,
+                    ToolBase.classicCodegen,
                     ToolBase.pluginBase,
                     ToolBase.jvmTools,
                     ToolBase.gradlePluginApi,
                     ToolBase.intellijPlatform,
                     ToolBase.intellijPlatformJava,
+                    ToolBase.protobufSetupPlugins,
                     ToolBase.psiJava,
                     Logging.lib,
                     Logging.libJvm,

grpc/src/main/kotlin/io/spine/tools/core/jvm/grpc/gradle/GrpcSettings.kt

@@ -26,7 +26,7 @@
 
 package io.spine.tools.core.jvm.grpc.gradle
 
-import io.spine.tools.gradle.protobuf.protobufExtension
+import io.spine.tools.protobuf.gradle.protobufExtension
 import javax.inject.Inject
 import org.gradle.api.Project
 import org.gradle.api.provider.Property

ksp/build.gradle.kts

@@ -75,6 +75,7 @@ dependencies {
         gradleKotlinDsl(),
         Kotlin.GradlePlugin.lib,
         TestLib.lib,
+        Compiler.pluginLib(Compiler.version),
         Kotest.assertions
     ).forEach {
         testImplementation(it)

ksp/src/main/kotlin/io/spine/tools/core/jvm/ksp/gradle/KspBasedPlugin.kt

@@ -28,8 +28,9 @@ package io.spine.tools.core.jvm.ksp.gradle
 
 import com.google.devtools.ksp.KspExperimental
 import com.google.devtools.ksp.gradle.KspExtension
+import com.google.protobuf.gradle.ProtobufExtension
 import io.spine.tools.compiler.gradle.api.CompilerTaskName
-import io.spine.tools.code.SourceSetName
+import io.spine.tools.compiler.gradle.api.generatedDir
 import io.spine.tools.core.jvm.ksp.gradle.KspBasedPlugin.Companion.autoServiceKsp
 import io.spine.tools.core.jvm.ksp.gradle.KspBasedPlugin.Companion.commonSettingsApplied
 import io.spine.tools.fs.DirectoryName.grpc
@@ -38,9 +39,6 @@ import io.spine.tools.fs.DirectoryName.kotlin
 import io.spine.tools.gradle.project.findKotlinCompileFor
 import io.spine.tools.gradle.project.sourceSet
 import io.spine.tools.gradle.project.sourceSets
-import io.spine.tools.gradle.protobuf.generated
-import io.spine.tools.gradle.protobuf.generatedDir
-import io.spine.tools.gradle.protobuf.generatedSourceProtoDir
 import io.spine.tools.gradle.task.findKotlinDirectorySet
 import java.io.File
 import org.gradle.api.Plugin
@@ -91,7 +89,7 @@ public abstract class KspBasedPlugin : Plugin<Project> {
             if (!commonSettingsApplied.contains(this)) {
                 useKsp2()
                 addDependencies()
-                makeKspIgnoreGeneratedSourceProtoDir()
+                makeKspIgnoreProtocOutputDir()
                 addSourcesGeneratedBySpineCompiler()
                 makeKspTasksDependOnSpineCompiler()
                 makeCompileKotlinTasksDependOnKspTasks()
@@ -167,13 +165,25 @@ private fun Project.useKsp2() {
 }
 
 /**
- * Makes KSP ignore sources under the `build/generated/source` directory
+ * Obtains the root directory into which Protobuf Gradle Plugin assigns the `protoc` output.
+ */
+private val Project.protocOutputDir: File?
+    get() {
+        val protobufExtension = extensions.findByType(ProtobufExtension::class.java)
+        val path = protobufExtension?.generatedFilesBaseDir
+        return path?.let { File(it) }
+    }
+
+/**
+ * Makes KSP ignore sources under the `build/generated/sources` directory
  * generated by `protoc` to avoid the duplicated types with the code
- * produced by ProtoData.
+ * produced by the Compiler.
  */
-private fun Project.makeKspIgnoreGeneratedSourceProtoDir() {
+private fun Project.makeKspIgnoreProtocOutputDir() {
     kspExtension?.apply {
-        excludedSources.from(generatedSourceProtoDir)
+        protocOutputDir?.let {
+            excludedSources.from(it)
+        }
     }
 }
 
@@ -183,8 +193,7 @@ private fun Project.makeKspIgnoreGeneratedSourceProtoDir() {
  */
 private fun Project.addSourcesGeneratedBySpineCompiler() {
     sourceSets.configureEach {
-        val ssn = SourceSetName(it.name)
-        val sourceSetDir = generated(ssn)
+        val sourceSetDir = generatedDir(it, "")
         it.findKotlinDirectorySet()?.srcDirs(
             sourceSetDir.resolve(java.name),
             sourceSetDir.resolve(kotlin.name),