Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/BuildExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvm.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
7 changes: 4 additions & 3 deletions buildSrc/src/main/kotlin/io/spine/dependency/test/Kotest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class JacocoConfig(

private fun registerRootReport(
tasks: TaskContainer,
copyReports: TaskProvider<Copy>?
copyReports: TaskProvider<Copy>
): TaskProvider<JacocoReport> {
val allSourceSets = Projects(projects).sourceSets()
val mainJavaSrcDirs = allSourceSets.mainJavaSrcDirs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,8 @@ fun Project.dependencies(): SortedSet<ScopedDependency> {
private fun Project.depsFromAllConfigurations(): Set<ModuleDependency> {
val result = mutableSetOf<ModuleDependency>()
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 =
Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/jvm-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/module-testing.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ dependencies {

testImplementation(TestLib.lib)
testImplementation(Kotest.assertions)
testImplementation(Kotest.datatest)

testRuntimeOnly(Jupiter.engine)
}
Expand Down