Merge pull request #195 from SpineEventEngine/new-validation-etc

Bump internal and external dependencies

Author: alexander-yevsyukov

.github/workflows/gradle-wrapper-validation.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   validation:
-    name: Validation
+    name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code

.gitignore

@@ -1,11 +1,11 @@
 #
-# Copyright 2024, TeamDev. All rights reserved.
+# Copyright 2025, TeamDev. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Redistribution and use in source and/or binary forms, with or without
 # modification, must retain the above copyright notice and the following
@@ -31,11 +31,14 @@
 #
 # Therefore, instructions below are superset of instructions required for all the projects.
 
-# jenv version file.
+# `jenv` local configuration.
 .java-version
 
-# Kotlin internal directory.
-buildSrc/.kotlin
+# Internal tool directories.
+.fleet/
+
+# Kotlin temp directories.
+**/.kotlin/
 
 # IntelliJ IDEA modules and interim config files.
 *.iml
@@ -54,14 +57,20 @@ buildSrc/.kotlin
 
 # Gradle interim configs
 **/.gradle/**
-!**/src/**/build/**
+
+# Temp directory for Gradle TestKit runners
+**/.gradle-test-kit/**
 
 # Generated source code
 **/generated/**
+**/*.pb.dart
+**/*.pbenum.dart
+**/*.pbserver.dart
+**/*.pbjson.dart
 
 # Gradle build files
 **/build/**
-!**/src/**/build/
+!**/src/**/build/**
 
 # Build files produced by the IDE
 **/out/**
@@ -81,9 +90,6 @@ gradle-app.setting
 # Spine internal directory for storing intermediate artifacts
 **/.spine/**
 
-# Spine model compiler auto-generated resources
-/tools/gradle-plugins/model-compiler/src/main/resources/spine-protoc.gradle
-
 # Login details to Maven repository.
 # Each workstation should have developer's login defined in this file.
 credentials.tar
@@ -94,7 +100,6 @@ gcs-auth-key.json
 
 # Log files
 *.log
-tests/_out/**
 
 # Package Files #
 *.war
@@ -109,4 +114,7 @@ hs_err_pid*
 .packages
 pubspec.lock
 
-.gradle-test-kit/
+# Ignore the `tmp` directory used for building dependant repositories.
+/tmp
+
+old-dot-gradle-test-kit/

.idea/codeStyles/Project.xml

@@ -36,12 +36,11 @@ import io.spine.gradle.RunGradle
 import io.spine.gradle.publish.PublishingRepos
 import io.spine.gradle.publish.SpinePublishing
 import io.spine.gradle.publish.spinePublishing
+import io.spine.gradle.repo.standardToSpineSdk
 import io.spine.gradle.report.coverage.JacocoConfig
 import io.spine.gradle.report.license.LicenseReporter
 import io.spine.gradle.report.pom.PomGenerator
-import io.spine.gradle.standardToSpineSdk
 import java.time.Duration
-import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 
 buildscript {
     standardSpineSdkRepositories()
@@ -58,11 +57,6 @@ buildscript {
 
             resolutionStrategy {
                 force(
-                    io.spine.dependency.lib.Grpc.api,
-                    io.spine.dependency.lib.KotlinX.Coroutines.bom,
-                    io.spine.dependency.lib.KotlinX.Coroutines.core,
-                    io.spine.dependency.lib.KotlinX.Coroutines.jdk8,
-
                     io.spine.dependency.local.Base.libForBuildScript,
                     io.spine.dependency.local.Reflect.lib,
                     toolBase.lib,
@@ -79,6 +73,7 @@ buildscript {
     }
     dependencies {
         classpath(mcJava.pluginLib)
+        classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
     }
 }
 
@@ -208,7 +203,3 @@ tasks.register<RunGradle>("checkPerformance") {
     // task("clean", "build")
     task("tasks")
 }
-
-val dokkaHtmlMultiModule by tasks.getting(DokkaMultiModuleTask::class) {
-    configureStyle()
-}

.idea/dictionaries/common.xml

@@ -53,7 +53,7 @@ repositories {
  * Please keep this value in sync with [io.spine.dependency.lib.Jackson.version].
  * It is not a requirement but would be good in terms of consistency.
  */
-val jacksonVersion = "2.15.3"
+val jacksonVersion = "2.18.3"
 
 /**
  * The version of Google Artifact Registry used by `buildSrc`.
@@ -75,15 +75,15 @@ 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.20"
+val kotlinEmbeddedVersion = "2.1.20"
 
 /**
  * The version of Guava used in `buildSrc`.
  *
  * Always use the same version as the one specified in [io.spine.dependency.lib.Guava].
  * Otherwise, when testing Gradle plugins, clashes may occur.
  */
-val guavaVersion = "32.1.3-jre"
+val guavaVersion = "33.4.8-jre"
 
 /**
  * The version of ErrorProne Gradle plugin.
@@ -93,7 +93,7 @@ val guavaVersion = "32.1.3-jre"
  * @see <a href="https://github.com/tbroyer/gradle-errorprone-plugin/releases">
  *     Error Prone Gradle Plugin Releases</a>
  */
-val errorPronePluginVersion = "4.1.0"
+val errorPronePluginVersion = "4.2.0"
 
 /**
  * The version of Protobuf Gradle Plugin.
@@ -113,7 +113,7 @@ val protobufPluginVersion = "0.9.4"
  * @see <a href="https://github.com/Kotlin/dokka/releases">
  *     Dokka Releases</a>
  */
-val dokkaVersion = "1.9.20"
+val dokkaVersion = "2.0.0"
 
 /**
  * The version of Detekt Gradle Plugin.
@@ -130,7 +130,7 @@ val kotestJvmPluginVersion = "0.4.10"
 /**
  * @see [io.spine.dependency.test.Kover]
  */
-val koverVersion = "0.7.2"
+val koverVersion = "0.9.1"
 
 /**
  * The version of the Shadow Plugin.
@@ -148,9 +148,9 @@ configurations.all {
             "com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",
 
             // Force Kotlin lib versions avoiding using those bundled with Gradle.
-            "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion",
-            "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion",
-            "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+            "org.jetbrains.kotlin:kotlin-stdlib:$kotlinEmbeddedVersion",
+            "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinEmbeddedVersion",
+            "org.jetbrains.kotlin:kotlin-reflect:$kotlinEmbeddedVersion"
         )
     }
 }
@@ -167,6 +167,7 @@ kotlin {
 
 dependencies {
     api("com.github.jk1:gradle-license-report:$licenseReportVersion")
+    api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinEmbeddedVersion"))
     dependOnAuthCommon()
 
     listOf(
@@ -175,17 +176,17 @@ dependencies {
         "com.github.jk1:gradle-license-report:$licenseReportVersion",
         "com.google.guava:guava:$guavaVersion",
         "com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",
-        "gradle.plugin.com.github.johnrengelman:shadow:${shadowVersion}",
+        "gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion",
         "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion",
         "io.kotest:kotest-gradle-plugin:$kotestJvmPluginVersion",
         // https://github.com/srikanth-lingala/zip4j
         "net.lingala.zip4j:zip4j:2.10.0",
-        "net.ltgt.gradle:gradle-errorprone-plugin:${errorPronePluginVersion}",
-        "org.ajoberstar.grgit:grgit-core:${grGitVersion}",
-        "org.jetbrains.dokka:dokka-base:${dokkaVersion}",
+        "net.ltgt.gradle:gradle-errorprone-plugin:$errorPronePluginVersion",
+        "org.ajoberstar.grgit:grgit-core:$grGitVersion",
+        "org.jetbrains.dokka:dokka-base:$dokkaVersion",
         "org.jetbrains.dokka:dokka-gradle-plugin:${dokkaVersion}",
-        "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion",
-        "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion",
+        "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinEmbeddedVersion",
+        "org.jetbrains.kotlin:kotlin-reflect:$kotlinEmbeddedVersion",
         "org.jetbrains.kotlinx:kover-gradle-plugin:$koverVersion"
     ).forEach {
         implementation(it)

build.gradle.kts

@@ -29,13 +29,14 @@
 import io.spine.dependency.build.ErrorProne
 import io.spine.dependency.build.GradleDoctor
 import io.spine.dependency.build.Ksp
+import io.spine.dependency.build.PluginPublishPlugin
 import io.spine.dependency.lib.Protobuf
 import io.spine.dependency.local.McJava
 import io.spine.dependency.local.ProtoData
 import io.spine.dependency.local.ProtoTap
 import io.spine.dependency.test.Kotest
 import io.spine.dependency.test.Kover
-import io.spine.gradle.standardToSpineSdk
+import io.spine.gradle.repo.standardToSpineSdk
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.JavaExec
@@ -66,7 +67,7 @@ import org.gradle.plugin.use.PluginDependencySpec
 private const val ABOUT_DEPENDENCY_EXTENSIONS = ""
 
 /**
- * Applies [standard][standardToSpineSdk] repositories to this `buildscript`.
+ * Applies [standard][io.spine.gradle.repo.standardToSpineSdk] repositories to this `buildscript`.
  */
 fun ScriptHandlerScope.standardSpineSdkRepositories() {
     repositories.standardToSpineSdk()
@@ -99,7 +100,7 @@ val ScriptHandlerScope.protoData: ProtoData
  * This plugin is published at Gradle Plugin Portal.
  * But when used in a pair with [mcJava], it cannot be applied directly to a project.
  * It is so, because [mcJava] uses [protoData] as its dependency.
- * And buildscript's classpath ends up with both of them.
+ * And the buildscript's classpath ends up with both of them.
  */
 val PluginDependenciesSpec.protoData: ProtoData
     get() = ProtoData
@@ -111,8 +112,8 @@ val PluginDependenciesSpec.protoData: ProtoData
  * declared in auto-generated `org.gradle.kotlin.dsl.PluginAccessors.kt` file.
  * It conflicts with our own declarations.
  *
- * Declaring of top-level shortcuts eliminates the need in applying plugins
- * using fully qualified name of dependency objects.
+ * Declaring of top-level shortcuts eliminates the need to apply plugins
+ * using a fully qualified name of dependency objects.
  *
  * It is still possible to apply a plugin with a custom version, if needed.
  * Just declare a version again on the returned [PluginDependencySpec].
@@ -150,6 +151,9 @@ val PluginDependenciesSpec.kover: PluginDependencySpec
 val PluginDependenciesSpec.ksp: PluginDependencySpec
     get() = id(Ksp.id).version(Ksp.version)
 
+val PluginDependenciesSpec.`plugin-publish`: PluginDependencySpec
+    get() = id(PluginPublishPlugin.id).version(PluginPublishPlugin.version)
+
 /**
  * Configures the dependencies between third-party Gradle tasks
  * and those defined via ProtoData and Spine Model Compiler.
@@ -185,7 +189,10 @@ fun Project.configureTaskDependencies() {
         val generateProto = "generateProto"
         val createVersionFile = "createVersionFile"
         val compileKotlin = "compileKotlin"
-        compileKotlin.dependOn(launchProtoData)
+        compileKotlin.run {
+            dependOn(generateProto)
+            dependOn(launchProtoData)
+        }
         val compileTestKotlin = "compileTestKotlin"
         compileTestKotlin.dependOn(launchTestProtoData)
         val sourcesJar = "sourcesJar"
@@ -223,7 +230,29 @@ fun Project.configureTaskDependencies() {
  * By convention, such modules are for integration tests and should be treated differently.
  */
 val Project.productionModules: Iterable<Project>
-    get() = rootProject.subprojects.filter { !it.name.contains("-tests") }
+    get() = rootProject.subprojects.filterNot { subproject ->
+        subproject.name.run {
+            contains("-tests")
+                    || contains("test-fixtures")
+                    || contains("integration-tests")
+        }
+    }
+
+/**
+ * Obtains the names of the [productionModules].
+ *
+ * The extension could be useful for excluding modules from standard publishing:
+ * ```kotlin
+ * spinePublishing {
+ *     val customModule = "my-custom-module"
+ *     modules = productionModuleNames.toSet().minus(customModule)
+ *     modulesWithCustomPublishing = setOf(customModule)
+ *     //...
+ * }
+ * ```
+ */
+val Project.productionModuleNames: List<String>
+    get() = productionModules.map { it.name }
 
 /**
  * Sets the remote debug option for this [JavaExec] task.

buildSrc/build.gradle.kts

@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 object BuildSettings {
     private const val JVM_VERSION = 17
     val javaVersion: JavaLanguageVersion = JavaLanguageVersion.of(JVM_VERSION)
+    @Suppress("unused")
     val javaVersionCompat = JavaVersion.toVersion(JVM_VERSION)
     val jvmTarget = JvmTarget.JVM_17
     const val REMOTE_DEBUG_PORT = 5566