Merge pull request #44 from SpineEventEngine/bump-core-jvm-compiler

Remove `kspKotlin` task dependencies

Author: alexander-yevsyukov

api/build.gradle.kts

@@ -76,8 +76,4 @@ forceSpineBase()
 
 afterEvaluate {
     spineCompilerRemoteDebug(enabled = false)
-
-    val kspKotlin by tasks.getting
-    val launchSpineCompiler by tasks.getting
-    kspKotlin.dependsOn(launchSpineCompiler)
 }

backend/build.gradle.kts

@@ -65,41 +65,3 @@ apply<IncrementGuard>()
 tasks.withType<CheckVersionIncrement> {
     repository = PublishingRepos.cloudArtifactRegistry
 }
-
-val nl: String = System.lineSeparator()
-
-/**
- * Prints output directories produced by `launchProtoData` tasks with
- * corresponding number of files in those directories.
-
-val launchProtoData: Task by tasks.getting {
-    doLast {
-        println("***** `launchProtoData.output`:")
-        outputs.files.forEach { dir ->
-            val fileCount = project.fileTree(dir).count()
-            println("$dir $fileCount files.")
-        }
-        println("*************************")
-    }
-}
- */
-
-/**
- * Prints input of `compileKotlin` tasks of this module.
-
-val compileKotlin: Task by tasks.getting {
-    doFirst {
-        println()
-        println(">>>> Kotlin source set dirs:")
-        sourceSets.main { kotlin.srcDirs.forEach { dir -> println("$dir")} }
-        println(">>>>> `compileKotlin` task inputs in `doFirst` :")
-        println(inputs.files.joinToString(separator = nl))
-    }
-}
- */
-
-afterEvaluate {
-    val kspKotlin by tasks.getting
-    val launchSpineCompiler by tasks.getting
-    kspKotlin.dependsOn(launchSpineCompiler)
-}

build.gradle.kts

@@ -186,10 +186,3 @@ dependencies {
         dokka(it)
     }
 }
-
-@Suppress("unused")
-val dokkaGeneratePublicationHtml by tasks.getting {
-//    productionModules.forEach {
-//        dependsOn(it.tasks.named("jar"))
-//    }
-}

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.2.20"
+val kotlinEmbeddedVersion = "2.2.21"
 
 /**
  * The version of Guava used in `buildSrc`.

buildSrc/src/main/kotlin/BuildExtensions.kt

@@ -197,35 +197,28 @@ fun Project.configureTaskDependencies() {
     }
 
     afterEvaluate {
-        val launchProtoData = "launchProtoData"
-        val launchTestProtoData = "launchTestProtoData"
         val generateProto = "generateProto"
         val createVersionFile = "createVersionFile"
         val compileKotlin = "compileKotlin"
         compileKotlin.run {
             dependOn(generateProto)
-            dependOn(launchProtoData)
         }
         val compileTestKotlin = "compileTestKotlin"
-        compileTestKotlin.dependOn(launchTestProtoData)
         val sourcesJar = "sourcesJar"
         val kspKotlin = "kspKotlin"
         sourcesJar.run {
             dependOn(generateProto)
-            dependOn(launchProtoData)
             dependOn(kspKotlin)
             dependOn(createVersionFile)
             dependOn("prepareProtocConfigVersions")
         }
         val dokkaHtml = "dokkaHtml"
         dokkaHtml.run {
             dependOn(generateProto)
-            dependOn(launchProtoData)
             dependOn(kspKotlin)
         }
         val dokkaJavadoc = "dokkaJavadoc"
         dokkaJavadoc.run {
-            dependOn(launchProtoData)
             dependOn(kspKotlin)
         }
         "publishPluginJar".dependOn(createVersionFile)

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

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

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.2.20"
+    const val runtimeVersion = "2.2.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.2.20"
+    const val embeddedVersion = "2.2.21"
 
     /**
      * The version of the JetBrains annotations library, which is a transitive

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.015"
+    const val dogfoodingVersion = "2.0.0-SNAPSHOT.021"
 
     /**
      * The version to be used for integration tests.
      */
-    const val version = "2.0.0-SNAPSHOT.015"
+    const val version = "2.0.0-SNAPSHOT.021"
 
     /**
      * The ID of the Gradle plugin.

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

@@ -34,8 +34,8 @@ package io.spine.dependency.local
 @Suppress("ConstPropertyName", "unused")
 object ToolBase {
     const val group = Spine.toolsGroup
-    const val version = "2.0.0-SNAPSHOT.366"
-    const val dogfoodingVersion = "2.0.0-SNAPSHOT.361"
+    const val version = "2.0.0-SNAPSHOT.368"
+    const val dogfoodingVersion = "2.0.0-SNAPSHOT.368"
 
     const val lib = "$group:tool-base:$version"
     const val classicCodegen = "$group:classic-codegen:$version"
@@ -54,7 +54,7 @@ object ToolBase {
     const val gradlePluginApiTestFixtures = "$group:gradle-plugin-api-test-fixtures:$version"
 
     const val jvmTools = "$group:jvm-tools:$version"
-    const val jvmToolPluginDogfooding = "$group:jvm-tool-all-plugins:$dogfoodingVersion"
+    const val jvmToolPluginDogfooding = "$group:jvm-tool-plugins-all:$dogfoodingVersion"
     const val jvmToolPlugins = "$group:jvm-tool-plugins-all:$version"
 
     const val protobufSetupPlugins = "$group:protobuf-setup-plugins:$version"

cli/build.gradle.kts

@@ -156,11 +156,3 @@ tasks.shadowJar {
 // See https://github.com/johnrengelman/shadow/issues/153.
 tasks.shadowDistTar.get().enabled = false
 tasks.shadowDistZip.get().enabled = false
-
-// Set explicit dependency for the `kspTestKotlin` task to avoid the Gradle warning
-// on missing explicit dependency.
-project.afterEvaluate {
-    val kspTestKotlin by tasks.getting
-    val launchTestSpineCompiler by tasks.getting
-    kspTestKotlin.dependsOn(launchTestSpineCompiler)
-}