Merge pull request #47 from SpineEventEngine/fix-ksp-tasks-dependencies

Fix KSP tasks dependencies

Author: alexander-yevsyukov

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

@@ -36,7 +36,7 @@ import io.spine.dependency.Dependency
 @Suppress("unused")
 object Ksp : Dependency() {
     override val version = "2.2.20-2.0.4"
-    val dogfoodingVersion = "2.1.21-2.0.1"
+    val dogfoodingVersion = version
     override val group = "com.google.devtools.ksp"
 
     const val id = "com.google.devtools.ksp"

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

@@ -46,12 +46,12 @@ object CoreJvmCompiler {
     /**
      * The version used to in the build classpath.
      */
-    const val dogfoodingVersion = "2.0.0-SNAPSHOT.017"
+    const val dogfoodingVersion = "2.0.0-SNAPSHOT.018"
 
     /**
      * The version to be used for integration tests.
      */
-    const val version = "2.0.0-SNAPSHOT.017"
+    const val version = "2.0.0-SNAPSHOT.018"
 
     /**
      * The ID of the Gradle plugin.

dependencies.md

@@ -23,3 +23,5 @@ kotlin.tests.individualTaskReports=true
 # For details please see:
 #   https://kotlinlang.org/docs/dokka-migration.html#enable-migration-helpers
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
+
+#org.gradle.debug=true

gradle.properties

@@ -117,7 +117,8 @@ public abstract class KspBasedPlugin : Plugin<Project> {
     private fun Project.addDependencies() {
         sourceSets.forEach { sourceSet ->
             val configurationName = sourceSet.compileOnlyConfigurationName
-            dependencies.add(configurationName,
+            dependencies.add(
+                configurationName,
                 autoServiceAnnotations
             )
         }
@@ -227,10 +228,11 @@ private fun Project.makeKspTasksDependOnSpineCompiler() {
         val kspTasks = kspTasks()
         kspTasks.forEach { (ssn, kspTask) ->
             val taskName = CompilerTaskName(ssn)
-            val compilerTask = tasks.findByName(taskName.value())
-            if (compilerTask != null) {
-                kspTask.dependsOn(compilerTask)
-            }
+            // Even if a task with `taskName` does not exist, the call
+            // to `mustRunAfter` won't fail.
+            // We do this instead of `dependsOn` because historically it
+            // proves to be unreliable in this particular case.
+            kspTask.mustRunAfter(taskName.value())
         }
     }
 }

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

@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine.tools</groupId>
 <artifactId>core-jvm-compiler</artifactId>
-<version>2.0.0-SNAPSHOT.018</version>
+<version>2.0.0-SNAPSHOT.019</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -23,12 +23,6 @@ all modules and does not describe the project structure per-subproject.
 </licenses>
 
 <dependencies>
-  <dependency>
-    <groupId>com.google.auto.service</groupId>
-    <artifactId>auto-service-annotations</artifactId>
-    <version>1.1.1</version>
-    <scope>compile</scope>
-  </dependency>
   <dependency>
     <groupId>com.google.devtools.ksp</groupId>
     <artifactId>symbol-processing-aa-embeddable</artifactId>
@@ -287,6 +281,12 @@ all modules and does not describe the project structure per-subproject.
     <version>5.13.2</version>
     <scope>test</scope>
   </dependency>
+  <dependency>
+    <groupId>com.google.auto.service</groupId>
+    <artifactId>auto-service-annotations</artifactId>
+    <version>1.1.1</version>
+    <scope>provided</scope>
+  </dependency>
   <dependency>
     <groupId>com.google.code.findbugs</groupId>
     <artifactId>jsr305</artifactId>
@@ -306,7 +306,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.21-2.0.1</version>
+    <version>2.2.20-2.0.4</version>
   </dependency>
   <dependency>
     <groupId>com.google.errorprone</groupId>
@@ -369,17 +369,17 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>core-jvm-gradle-plugins</artifactId>
-    <version>2.0.0-SNAPSHOT.017</version>
+    <version>2.0.0-SNAPSHOT.018</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>core-jvm-plugins</artifactId>
-    <version>2.0.0-SNAPSHOT.017</version>
+    <version>2.0.0-SNAPSHOT.018</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>core-jvm-routing</artifactId>
-    <version>2.0.0-SNAPSHOT.017</version>
+    <version>2.0.0-SNAPSHOT.018</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>

pom.xml

@@ -117,13 +117,6 @@ sourceSets.testFixtures {
     kotlin.srcDir("generated/ksp/testFixtures/kotlin")
 }
 
-// Avoid Gradle warning on disabled execution optimization because of the absence of
-// explicit or implicit dependencies.
-afterEvaluate {
-    val kspTestFixturesKotlin by tasks.getting
-    val launchTestFixturesSpineCompiler by tasks.getting
-    kspTestFixturesKotlin.dependsOn(launchTestFixturesSpineCompiler)
-}
 
 configurations
     // https://detekt.dev/docs/gettingstarted/gradle/#dependencies
@@ -135,3 +128,11 @@ configurations
             )
         }
     }
+
+// Avoid Gradle warning on disabled execution optimization because of the absence of
+// explicit or implicit dependencies.
+afterEvaluate {
+    val kspTestFixturesKotlin by tasks.getting
+    val launchTestFixturesSpineCompiler by tasks.getting
+    kspTestFixturesKotlin.dependsOn(launchTestFixturesSpineCompiler)
+}

routing-tests/build.gradle.kts

@@ -64,13 +64,6 @@ dependencies {
     testImplementation(Logging.testLib)
 }
 
-// Avoid the missing file error for generated code when running tests out of the IDE.
-afterEvaluate {
-    val kspTestKotlin by tasks.getting
-    val launchTestSpineCompiler by tasks.getting
-    kspTestKotlin.dependsOn(launchTestSpineCompiler)
-}
-
 if (JavaVersion.current() >= JavaVersion.VERSION_16) {
     tasks.withType<Test>().configureEach {
         jvmArgs(
@@ -88,6 +81,13 @@ if (JavaVersion.current() >= JavaVersion.VERSION_16) {
     }
 }
 
+// Avoid the missing file error for generated code when running tests out of the IDE.
+afterEvaluate {
+    val kspTestKotlin by tasks.getting
+    val launchTestSpineCompiler by tasks.getting
+    kspTestKotlin.dependsOn(launchTestSpineCompiler)
+}
+
 afterEvaluate {
     val writeSpineCompilerSettings by tasks.getting
     val processResources by tasks.getting

routing/build.gradle.kts

@@ -219,14 +219,4 @@ subprojects {
     }
 
     disableDocumentationTasks()
-
-    afterEvaluate {
-        val kspKotlin by tasks.getting
-        val launchSpineCompiler by tasks.getting
-        kspKotlin.dependsOn(launchSpineCompiler)
-
-        val kspTestKotlin by tasks.getting
-        val launchTestSpineCompiler by tasks.getting
-        kspTestKotlin.dependsOn(launchTestSpineCompiler)
-    }
 }

tests/build.gradle.kts

@@ -29,5 +29,5 @@
  *
  * Do not rename this property, as it is also used in the integration tests via its name.
  */
-val coreJvmCompilerVersion by extra("2.0.0-SNAPSHOT.018")
+val coreJvmCompilerVersion by extra("2.0.0-SNAPSHOT.019")
 val versionToPublish by extra(coreJvmCompilerVersion)