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
7 changes: 6 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ val jacksonVersion = "2.18.3"
*/
val googleAuthToolVersion = "2.1.5"

val licenseReportVersion = "2.7"
/**
* Generates reports about the licenses of the dependencies for a Gradle project.
*
* https://github.com/jk1/Gradle-License-Report
*/
val licenseReportVersion = "3.1.2"

val grGitVersion = "4.1.1"

Expand Down
4 changes: 3 additions & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/build/Dokka.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

package io.spine.dependency.build

import io.spine.dependency.local.Spine

// https://github.com/Kotlin/dokka
@Suppress("unused", "ConstPropertyName")
object Dokka {
Expand Down Expand Up @@ -76,7 +78,7 @@ object Dokka {
* Custom Dokka Plugins</a>
*/
object SpineExtensions {
private const val group = "io.spine.tools"
private const val group = Spine.toolsGroup

const val version = "2.0.0-SNAPSHOT.7"
const val lib = "$group:spine-dokka-extensions:$version"
Expand Down

This file was deleted.

11 changes: 8 additions & 3 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
package io.spine.dependency.local

import io.spine.dependency.Dependency
import io.spine.dependency.local.Compiler.DF_VERSION_ENV
import io.spine.dependency.local.Compiler.VERSION_ENV
import io.spine.dependency.local.Compiler.dogfoodingVersion
import io.spine.dependency.local.Compiler.pluginLib
import io.spine.dependency.local.Compiler.version

/**
* Dependencies on the Spine Compiler modules.
Expand Down Expand Up @@ -60,7 +65,7 @@ import io.spine.dependency.Dependency
)
object Compiler : Dependency() {
const val pluginGroup = Spine.group
override val group = "io.spine.tools"
override val group = Spine.toolsGroup
const val pluginId = "io.spine.compiler"

/**
Expand All @@ -72,7 +77,7 @@ object Compiler : Dependency() {
* The version of the Compiler dependencies.
*/
override val version: String
private const val fallbackVersion = "2.0.0-SNAPSHOT.041"
private const val fallbackVersion = "2.0.0-SNAPSHOT.042"

/**
* The distinct version of the Compiler used by other build tools.
Expand All @@ -81,7 +86,7 @@ object Compiler : Dependency() {
* transitive dependencies, this is the version used to build the project itself.
*/
val dogfoodingVersion: String
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.041"
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.042"

/**
* The artifact for the Compiler Gradle plugin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package io.spine.dependency.local
"MemberVisibilityCanBePrivate" /* The properties are used directly by other subprojects. */,
)
object ProtoTap {
const val group = "io.spine.tools"
const val group = Spine.toolsGroup
const val version = "0.14.0"
const val gradlePluginId = "io.spine.prototap"
const val api = "$group:prototap-api:$version"
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ package io.spine.dependency.local
*/
@Suppress("ConstPropertyName")
object TestLib {
const val version = "2.0.0-SNAPSHOT.211"
const val version = "2.0.0-SNAPSHOT.212"
const val group = Spine.toolsGroup
const val artifact = "spine-testlib"
const val artifact = "base-testlib"
const val lib = "$group:$artifact:$version"
}
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 = "6.1.10"
const val version = "6.1.11"
const val group = "io.kotest"
const val gradlePluginId = "io.kotest"
const val assertions = "$group:kotest-assertions-core:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,7 @@ class UpdateGitHubPages : Plugin<Project> {
override fun apply(project: Project) {
val extension = UpdateGitHubPagesExtension.createIn(project)
project.afterEvaluate {
//TODO:2025-11-20:alexander.yevsyukov: Remove this line and uncomment the below block
// when new publishing procedure is finalized.
registerTasks(extension)
// val projectVersion = project.version.toString()
// if (projectVersion.isSnapshot()) {
// registerNoOpTask()
// } else {
// registerTasks(extension)
// }
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

package io.spine.gradle.publish

import io.spine.dependency.local.Spine
import io.spine.gradle.repo.Repository
import java.util.Locale
import org.gradle.api.Project
Expand Down Expand Up @@ -435,7 +436,7 @@ open class SpinePublishing(private val project: Project) {
}

private val Project.isTool: Boolean
get() = group == "io.spine.tools"
get() = group == Spine.toolsGroup

/**
* Ensures that all modules, marked as included into [testJar] publishing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ package io.spine.gradle.report.license
import com.github.jk1.license.LicenseReportExtension
import com.github.jk1.license.LicenseReportExtension.ALL
import com.github.jk1.license.LicenseReportPlugin
import io.spine.dependency.local.Spine
import io.spine.gradle.applyPlugin
import io.spine.gradle.getTask
import java.io.File
Expand Down Expand Up @@ -85,10 +86,10 @@ object LicenseReporter {
with(project.the<LicenseReportExtension>()) {
outputDir = reportOutputDir.absolutePath
excludeGroups = arrayOf(
"io.spine",
Spine.group,
"io.spine.gcloud",
"io.spine.protodata",
"io.spine.tools",
Spine.toolsGroup,
"io.spine.validation"
)
configurations = ALL
Expand Down
4 changes: 4 additions & 0 deletions migrate
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ cp -a .github-workflows/. ../.github/workflows
cp -a .github/workflows/. ../.github/workflows
rm -f ../.github/workflows/detekt-code-analysis.yml # This one is `config`-only workflow.

# 2026-04-06 Remove `LicenseReport.kt` as the dependency object is not used.
# We use the `LicenseReportPlugin` class via the dependency in `buildSrc/build.gradle.kts`.
rm -f ../buildSrc/src/main/kotlin/io/spine/dependency/build/LicenseReport.kt

# 2025-11-20 Remove renamed `Runtime.kt` file.
rm -f ../buildSrc/src/main/kotlin/io/spine/gradle/Runtime.kt

Expand Down
Loading