From 0eb410c87e43e245089e930ebc73490731c72ca9 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Fri, 10 Oct 2025 16:19:57 +0100 Subject: [PATCH 1/2] Bring updates from Base --- buildSrc/src/main/kotlin/BuildExtensions.kt | 2 +- .../kotlin/io/spine/dependency/build/GradleDoctor.kt | 2 +- .../src/main/kotlin/io/spine/dependency/build/Ksp.kt | 2 +- .../src/main/kotlin/io/spine/dependency/lib/Kotlin.kt | 4 ++-- .../src/main/kotlin/io/spine/dependency/local/CoreJvm.kt | 9 +++++++-- .../kotlin/io/spine/dependency/local/CoreJvmCompiler.kt | 4 ---- .../src/main/kotlin/io/spine/dependency/local/McJava.kt | 2 +- .../src/main/kotlin/io/spine/dependency/local/TestLib.kt | 2 +- .../src/main/kotlin/io/spine/dependency/local/Time.kt | 2 +- .../src/main/kotlin/io/spine/dependency/test/Kotest.kt | 7 ++++--- .../io/spine/gradle/report/coverage/JacocoConfig.kt | 2 +- .../io/spine/gradle/report/pom/DependencyWriter.kt | 7 ++----- buildSrc/src/main/kotlin/jvm-module.gradle.kts | 1 - buildSrc/src/main/kotlin/module-testing.gradle.kts | 1 - 14 files changed, 22 insertions(+), 25 deletions(-) diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt index 34e262b6b..5214f6e41 100644 --- a/buildSrc/src/main/kotlin/BuildExtensions.kt +++ b/buildSrc/src/main/kotlin/BuildExtensions.kt @@ -31,8 +31,8 @@ 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.CoreJvmCompiler import io.spine.dependency.local.Compiler +import io.spine.dependency.local.CoreJvmCompiler import io.spine.dependency.local.McJava import io.spine.dependency.local.ProtoTap import io.spine.dependency.test.Kotest diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt index 89cfb341b..766430bd7 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt @@ -33,6 +33,6 @@ package io.spine.dependency.build */ @Suppress("unused", "ConstPropertyName") object GradleDoctor { - const val version = "0.10.0" + const val version = "0.12.0" const val pluginId = "com.osacky.doctor" } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt index 9cc028567..f96ce56f3 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt +++ b/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.2.20-2.0.4" override val group = "com.google.devtools.ksp" const val id = "com.google.devtools.ksp" diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt b/buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt index 48694c51a..0029ab1e3 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt +++ b/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.1.21" + const val runtimeVersion = "2.2.20" 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.1.21" + const val embeddedVersion = "2.2.20" /** * The version of the JetBrains annotations library, which is a transitive diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt index 10d9a62e8..d9f5ba3b9 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt @@ -37,7 +37,7 @@ typealias CoreJava = CoreJvm @Suppress("ConstPropertyName", "unused") object CoreJvm { const val group = Spine.group - const val version = "2.0.0-SNAPSHOT.330" + const val version = "2.0.0-SNAPSHOT.332" const val coreArtifact = "spine-core" const val clientArtifact = "spine-client" @@ -47,5 +47,10 @@ object CoreJvm { const val client = "$group:$clientArtifact:$version" const val server = "$group:$serverArtifact:$version" - const val testUtilServer = "${ToolBase.group}:spine-testutil-server:$version" + @Deprecated("Use `serverTestLib` instead.", ReplaceWith("serverTestLib")) + const val testUtilServer = "${Spine.toolsGroup}:spine-server-testlib:$version" + + const val coreTestLib = "${Spine.toolsGroup}:spine-core-testlib:$version" + const val clientTestLib = "${Spine.toolsGroup}:spine-client-testlib:$version" + const val serverTestLib = "${Spine.toolsGroup}:spine-server-testlib:$version" } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt index 1c3e0526e..5762d4864 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt @@ -26,10 +26,6 @@ package io.spine.dependency.local -import io.spine.dependency.local.CoreJvmCompiler.dogfoodingVersion -import io.spine.dependency.local.CoreJvmCompiler.version - - /** * Dependencies on the CoreJvm Compiler artifacts. * diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt index 7a7336b71..6ab0a9565 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt @@ -37,7 +37,7 @@ package io.spine.dependency.local "unused" ) object McJava { - const val group = ToolBase.group + const val group = Spine.toolsGroup /** * The version used to in the build classpath. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt index 1f3ffc3c4..f9754bbbe 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt @@ -34,7 +34,7 @@ package io.spine.dependency.local @Suppress("ConstPropertyName") object TestLib { const val version = "2.0.0-SNAPSHOT.210" - const val group = ToolBase.group + const val group = Spine.toolsGroup const val artifact = "spine-testlib" const val lib = "$group:$artifact:$version" } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt index c10dae577..289adeeb5 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt @@ -38,5 +38,5 @@ object Time { const val artifact = "spine-time" const val lib = "$group:$artifact:$version" - const val testLib = "${ToolBase.group}:spine-time-testlib:$version" + const val testLib = "${Spine.toolsGroup}:spine-time-testlib:$version" } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/test/Kotest.kt b/buildSrc/src/main/kotlin/io/spine/dependency/test/Kotest.kt index 8de10ff6c..0d71ab2f5 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/test/Kotest.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/test/Kotest.kt @@ -35,7 +35,7 @@ package io.spine.dependency.test */ @Suppress("unused", "ConstPropertyName") object Kotest { - const val version = "5.9.1" + const val version = "6.0.3" const val group = "io.kotest" const val assertions = "$group:kotest-assertions-core:$version" const val runnerJUnit5 = "$group:kotest-runner-junit5:$version" @@ -46,14 +46,15 @@ object Kotest { // https://plugins.gradle.org/plugin/io.kotest.multiplatform object MultiplatformGradlePlugin { - const val version = Kotest.version + const val version = "6.0.0.M4" const val id = "io.kotest.multiplatform" const val classpath = "$group:kotest-framework-multiplatform-plugin-gradle:$version" } // https://github.com/kotest/kotest-gradle-plugin + @Deprecated("The repository is archived. Use `io.kotest.multiplatform` plugin instead.") object JvmGradlePlugin { - const val version = "0.4.10" + const val version = "0.4.11" const val id = "io.kotest" const val classpath = "$group:kotest-gradle-plugin:$version" } diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt index 5114add75..65bf2ee9e 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt @@ -144,7 +144,7 @@ class JacocoConfig( private fun registerRootReport( tasks: TaskContainer, - copyReports: TaskProvider? + copyReports: TaskProvider ): TaskProvider { val allSourceSets = Projects(projects).sourceSets() val mainJavaSrcDirs = allSourceSets.mainJavaSrcDirs() diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt index eda249365..79d00c629 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt @@ -121,11 +121,8 @@ fun Project.dependencies(): SortedSet { private fun Project.depsFromAllConfigurations(): Set { val result = mutableSetOf() this.configurations.forEach { configuration -> - if (configuration.isCanBeResolved) { - // Force resolution of the configuration. - configuration.resolvedConfiguration - } - configuration.dependencies.filter { it.isExternal() } + configuration.dependencies + .filter { it.isExternal() } .forEach { dependency -> val forcedVersion = configuration.forcedVersionOf(dependency) val moduleDependency = diff --git a/buildSrc/src/main/kotlin/jvm-module.gradle.kts b/buildSrc/src/main/kotlin/jvm-module.gradle.kts index b3d6ef0dd..7bc595c83 100644 --- a/buildSrc/src/main/kotlin/jvm-module.gradle.kts +++ b/buildSrc/src/main/kotlin/jvm-module.gradle.kts @@ -48,7 +48,6 @@ plugins { id("project-report") id("dokka-for-java") kotlin("jvm") - id("io.kotest") id("detekt-code-analysis") id("dokka-for-kotlin") id("org.jetbrains.kotlinx.kover") diff --git a/buildSrc/src/main/kotlin/module-testing.gradle.kts b/buildSrc/src/main/kotlin/module-testing.gradle.kts index 715852c7d..ee3fe6105 100644 --- a/buildSrc/src/main/kotlin/module-testing.gradle.kts +++ b/buildSrc/src/main/kotlin/module-testing.gradle.kts @@ -65,7 +65,6 @@ dependencies { testImplementation(TestLib.lib) testImplementation(Kotest.assertions) - testImplementation(Kotest.datatest) testRuntimeOnly(Jupiter.engine) } From 0b21405f14e71c7840a06c6f0ab32d87a4708aae Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Fri, 10 Oct 2025 16:20:19 +0100 Subject: [PATCH 2/2] Bump Base -> `2.0.0-SNAPSHOT.361` --- buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt index 65ac46845..b8351d98c 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt +++ b/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.360" - const val versionForBuildScript = "2.0.0-SNAPSHOT.360" + const val version = "2.0.0-SNAPSHOT.361" + const val versionForBuildScript = "2.0.0-SNAPSHOT.361" const val group = Spine.group const val artifact = "spine-base" const val lib = "$group:$artifact:$version"