Merge pull request #194 from SpineEventEngine/redirect-again

alexander-yevsyukov · web-flow · commit 706d38958e68 · 2025-03-27T18:53:44.000Z
Restore redirection of `KspTask`s to `$projectDir/generated`
diff --git 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 kotlinVersion = "2.1.10"
+val kotlinVersion = "2.1.20"
 
 /**
  * The version of Guava used in `buildSrc`.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt b/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.304"
+    const val version = "2.0.0-SNAPSHOT.307"
     const val versionForBuildScript = "2.0.0-SNAPSHOT.304"
     const val group = Spine.group
     const val artifact = "spine-base"
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt b/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.126"
+    const val version = "2.0.0-SNAPSHOT.200"
     const val group = Spine.group
     const val artifact = "spine-base-types"
     const val lib = "$group:$artifact:$version"
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt
@@ -33,7 +33,7 @@ package io.spine.dependency.local
  */
 @Suppress("ConstPropertyName")
 object Change {
-    const val version = "2.0.0-SNAPSHOT.118"
+    const val version = "2.0.0-SNAPSHOT.200"
     const val group = Spine.group
     const val artifact = "spine-change"
     const val lib = "$group:$artifact:$version"
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt
@@ -42,12 +42,12 @@ object McJava {
     /**
      * The version used to in the build classpath.
      */
-    const val dogfoodingVersion = "2.0.0-SNAPSHOT.305"
+    const val dogfoodingVersion = "2.0.0-SNAPSHOT.306"
 
     /**
      * The version to be used for integration tests.
      */
-    const val version = "2.0.0-SNAPSHOT.305"
+    const val version = "2.0.0-SNAPSHOT.306"
 
     /**
      * The ID of the Gradle plugin.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt
@@ -73,7 +73,7 @@ object ProtoData {
      * The version of ProtoData dependencies.
      */
     val version: String
-    private const val fallbackVersion = "0.93.4"
+    private const val fallbackVersion = "0.93.6"
 
     /**
      * The distinct version of ProtoData used by other build tools.
@@ -82,7 +82,7 @@ object ProtoData {
      * transitional dependencies, this is the version used to build the project itself.
      */
     val dogfoodingVersion: String
-    private const val fallbackDfVersion = "0.93.4"
+    private const val fallbackDfVersion = "0.93.6"
 
     /**
      * The artifact for the ProtoData Gradle plugin.
diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
@@ -33,7 +33,7 @@ package io.spine.dependency.local
  */
 @Suppress("ConstPropertyName")
 object Time {
-    const val version = "2.0.0-SNAPSHOT.136"
+    const val version = "2.0.0-SNAPSHOT.200"
     const val group = Spine.group
     const val artifact = "spine-time"
     const val lib = "$group:$artifact:$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
@@ -36,7 +36,7 @@ object Validation {
     /**
      * The version of the Validation library artifacts.
      */
-    const val version = "2.0.0-SNAPSHOT.302"
+    const val version = "2.0.0-SNAPSHOT.305"
 
     const val group = "io.spine.validation"
     private const val prefix = "spine-validation"
diff --git a/buildSrc/src/main/kotlin/module.gradle.kts b/buildSrc/src/main/kotlin/module.gradle.kts
@@ -176,7 +176,9 @@ fun Module.forceConfigurations() {
                     // Force the version to avoid the version conflict for
                     // the `:mc-java:ProtoData` configuration.
                     Validation.runtime,
+                    Validation.java,
                     Validation.javaBundle,
+                    Validation.config,
                     ProtoData.api,
                     ProtoData.gradleApi,
                     ProtoData.java,
diff --git a/config b/config
@@ -1 +1 @@
-Subproject commit 78dbf5f3705c76917ec6fb72e4da304d6440be5a
+Subproject commit 99fb7ce679e6c71713fd6c21c24e0cd19304b118
diff --git a/dependencies.md b/dependencies.md
diff --git a/mc-java-comparable/src/main/kotlin/io/spine/tools/mc/java/comparable/action/ComparatorBuilder.kt b/mc-java-comparable/src/main/kotlin/io/spine/tools/mc/java/comparable/action/ComparatorBuilder.kt
@@ -32,7 +32,7 @@ import io.spine.base.FieldPath
 import io.spine.protodata.java.ClassName
 import io.spine.protodata.java.Expression
 import io.spine.protodata.java.FieldDeclaration
-import io.spine.protodata.java.ParameterizedClassName
+import io.spine.protodata.java.ParameterizedTypeName
 import io.spine.protodata.java.call
 import io.spine.string.camelCase
 import io.spine.string.lowerCamelCase
@@ -78,7 +78,7 @@ internal class ComparatorBuilder(cls: PsiClass, private val reversed: Boolean =
         }
         return FieldDeclaration(
             modifiers = "private static final",
-            type = ParameterizedClassName(comparator, message),
+            type = ParameterizedTypeName(comparator, message),
             name = "comparator",
             value = comparisons
         )
diff --git a/mc-java-ksp/src/main/kotlin/io/spine/tools/mc/java/ksp/gradle/KspBasedPlugin.kt b/mc-java-ksp/src/main/kotlin/io/spine/tools/mc/java/ksp/gradle/KspBasedPlugin.kt
@@ -34,8 +34,10 @@ import io.spine.tools.fs.DirectoryName.grpc
 import io.spine.tools.fs.DirectoryName.java
 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 io.spine.tools.mc.java.ksp.gradle.KspBasedPlugin.Companion.autoServiceKsp
@@ -238,25 +240,14 @@ private fun Project.makeCompileKotlinTasksDependOnKspTasks() {
 }
 
 /**
- * **DOES NOTHING** until [File.toRelativeString] correctly supports the calculation
- * of a relative directory in a way we need for the replacement of
- * the [outputBaseDir][com.google.devtools.ksp.gradle.KspGradleConfig.outputBaseDir]
- * we want to make in this function.
- *
- * Another issue with [File.toRelativeString] is that it does not handle
- * [different file path roots](https://github.com/google/ksp/issues/1079).
- *
- * -------
  * The function replaces default destination directory defied by
  * [com.google.devtools.ksp.gradle.KspGradleSubplugin.getKspOutputDir] to
  * the one we used for all the generated code at the level of the project root.
  *
  * Also `kotlin` directory set for each source set gets new generated
  * Kotlin and Java source directories as its inputs.
  */
-@Suppress("UnusedReceiverParameter")
 private fun Project.replaceKspOutputDirs() {
-    /*
     afterEvaluate {
         val underBuild = KspGradlePlugin.defaultTargetDirectory(it).toString()
         val underProject = generatedDir.toString()
@@ -265,18 +256,23 @@ private fun Project.replaceKspOutputDirs() {
                 outputBaseDir.replace(underBuild, underProject)
                 kotlinOutputDir.replace(underBuild, underProject)
                 javaOutputDir.replace(underBuild, underProject)
+                resourceOutputDir.replace(underBuild, underProject)
+
+                val sourceSet = sourceSet(ssn)
+                sourceSet.run {
+                    // KSP Gradle Plugin already added its output to source sets.
+                    // We need to add the replacement manually because we filtered
+                    // it before in `Project.makeKspIgnoreGeneratedSourceProtoDir()`.
+
+                    java.srcDirs(javaOutputDir)
+                    findKotlinDirectorySet()?.srcDirs(kotlinOutputDir)
 
-                // KSP Gradle Plugin already added its output to source sets.
-                // We need to add the replacement manually because we filtered
-                // it before in `Project.excludeSourcesFromBuildDir()`.
-                sourceSet(ssn).kotlinDirectorySet()?.run {
-                    srcDirs(kotlinOutputDir)
-                    srcDirs(javaOutputDir)
+                    // We need to add redirected KSP-generated resources too.
+                    resources.srcDirs(resourceOutputDir)
                 }
             }
         }
     }
-    */
 }
 
 /**
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine.tools</groupId>
 <artifactId>mc-java</artifactId>
-<version>2.0.0-SNAPSHOT.306</version>
+<version>2.0.0-SNAPSHOT.307</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -62,13 +62,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>protodata</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-base</artifactId>
-    <version>2.0.0-SNAPSHOT.304</version>
+    <version>2.0.0-SNAPSHOT.307</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -92,19 +92,19 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.protodata</groupId>
     <artifactId>protodata-gradle-api</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.protodata</groupId>
     <artifactId>protodata-java</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.protodata</groupId>
     <artifactId>protodata-params</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -128,13 +128,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.validation</groupId>
     <artifactId>spine-validation-configuration</artifactId>
-    <version>2.0.0-SNAPSHOT.302</version>
+    <version>2.0.0-SNAPSHOT.305</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.validation</groupId>
     <artifactId>spine-validation-java-runtime</artifactId>
-    <version>2.0.0-SNAPSHOT.302</version>
+    <version>2.0.0-SNAPSHOT.305</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -182,7 +182,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.protodata</groupId>
     <artifactId>protodata-testlib</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -282,7 +282,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>com.google.devtools.ksp</groupId>
     <artifactId>symbol-processing-cmdline</artifactId>
-    <version>2.1.10-1.0.31</version>
+    <version>2.1.20-1.0.31</version>
   </dependency>
   <dependency>
     <groupId>com.google.errorprone</groupId>
@@ -334,12 +334,12 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.protodata</groupId>
     <artifactId>protodata-fat-cli</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
   </dependency>
   <dependency>
     <groupId>io.spine.protodata</groupId>
     <artifactId>protodata-protoc</artifactId>
-    <version>0.93.4</version>
+    <version>0.93.6</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
@@ -354,17 +354,17 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mc-java-plugins</artifactId>
-    <version>2.0.0-SNAPSHOT.305</version>
+    <version>2.0.0-SNAPSHOT.306</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mc-java-routing</artifactId>
-    <version>2.0.0-SNAPSHOT.305</version>
+    <version>2.0.0-SNAPSHOT.306</version>
   </dependency>
   <dependency>
     <groupId>io.spine.validation</groupId>
     <artifactId>spine-validation-java-bundle</artifactId>
-    <version>2.0.0-SNAPSHOT.302</version>
+    <version>2.0.0-SNAPSHOT.305</version>
   </dependency>
   <dependency>
     <groupId>net.sourceforge.pmd</groupId>
@@ -440,23 +440,22 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-build-tools-impl</artifactId>
-    <version>2.1.10</version>
+    <version>2.1.20</version>
   </dependency>
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-compiler-embeddable</artifactId>
     <version>2.1.20</version>
-    <scope>provided</scope>
   </dependency>
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-klib-commonizer-embeddable</artifactId>
-    <version>2.1.10</version>
+    <version>2.1.20</version>
   </dependency>
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-scripting-compiler-embeddable</artifactId>
-    <version>2.1.10</version>
+    <version>2.1.20</version>
   </dependency>
 </dependencies>
 
diff --git a/version.gradle.kts b/version.gradle.kts
@@ -31,5 +31,5 @@
  *
  * For versions of Spine-based dependencies please see [io.spine.internal.dependency.spine].
  */
-val mcJavaVersion by extra("2.0.0-SNAPSHOT.306")
+val mcJavaVersion by extra("2.0.0-SNAPSHOT.307")
 val versionToPublish by extra(mcJavaVersion)
