From 3591ccb61f0e3aab348b81eef42183a49dd638c0 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 9 Dec 2025 19:40:21 +0000 Subject: [PATCH 1/5] Add `spine-environment` Also: * Sort out artifact declarations. --- .../kotlin/io/spine/dependency/local/Base.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 505100bf..af6c4009 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt @@ -33,12 +33,14 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName", "unused") object Base { - const val version = "2.0.0-SNAPSHOT.382" - const val versionForBuildScript = "2.0.0-SNAPSHOT.382" + const val version = "2.0.0-SNAPSHOT.383" + const val versionForBuildScript = "2.0.0-SNAPSHOT.383" const val group = Spine.group - const val artifact = "spine-base" - const val lib = "$group:$artifact:$version" - const val format = "$group:spine-format:$version" - const val libForBuildScript = "$group:$artifact:$versionForBuildScript" - const val annotations = "$group:spine-annotations:$version" + private const val prefix = "spine" + const val libModule = "$prefix-base" + const val lib = "$group:$libModule:$version" + const val libForBuildScript = "$group:$libModule:$versionForBuildScript" + const val annotations = "$group:$prefix-annotations:$version" + const val environment = "$group:$prefix-environment:$version" + const val format = "$group:$prefix-format:$version" } From ae6d1b05b5a124d46eec48d12a4ea670b6a816f3 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 9 Dec 2025 19:40:35 +0000 Subject: [PATCH 2/5] Bump local dependencies --- .../src/main/kotlin/io/spine/dependency/local/Compiler.kt | 4 ++-- .../main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt | 4 ++-- .../src/main/kotlin/io/spine/dependency/local/Validation.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt index f0ad0be5..73ef7537 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt @@ -70,7 +70,7 @@ object Compiler { * The version of the Compiler dependencies. */ val version: String - private const val fallbackVersion = "2.0.0-SNAPSHOT.034" + private const val fallbackVersion = "2.0.0-SNAPSHOT.035" /** * The distinct version of the Compiler used by other build tools. @@ -79,7 +79,7 @@ object Compiler { * transitive dependencies, this is the version used to build the project itself. */ val dogfoodingVersion: String - private const val fallbackDfVersion = "2.0.0-SNAPSHOT.030" + private const val fallbackDfVersion = "2.0.0-SNAPSHOT.035" /** * The artifact for the Compiler Gradle plugin. 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 c96d774b..0c6a6a21 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt +++ b/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.035" + const val dogfoodingVersion = "2.0.0-SNAPSHOT.040" /** * The version to be used for integration tests. */ - const val version = "2.0.0-SNAPSHOT.035" + const val version = "2.0.0-SNAPSHOT.040" /** * The ID of the Gradle plugin. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt index 7314d125..dd199caf 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt @@ -36,7 +36,7 @@ object Validation { /** * The version of the Validation library artifacts. */ - const val version = "2.0.0-SNAPSHOT.360" + const val version = "2.0.0-SNAPSHOT.370" /** * The last version of Validation compatible with ProtoData. From 08148c21663829fb0f302fd55d73b58aebc18706 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 9 Dec 2025 19:41:37 +0000 Subject: [PATCH 3/5] Open publication handlers ... so that `PUBLICATION_NAME` can be used for tunning publications. --- .../main/kotlin/io/spine/gradle/publish/PublicationHandler.kt | 2 +- .../io/spine/gradle/publish/StandardJavaPublicationHandler.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublicationHandler.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublicationHandler.kt index ad5596ca..5b3bbe12 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublicationHandler.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublicationHandler.kt @@ -53,7 +53,7 @@ private const val MAVEN_PUBLISH = "maven-publish" * the [`spinePublishing`][io.spine.gradle.publish.SpinePublishing.destinations] * extension applied to the subproject. */ -internal sealed class PublicationHandler( +sealed class PublicationHandler( protected val project: Project, protected var destinations: Set ) { diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/StandardJavaPublicationHandler.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/StandardJavaPublicationHandler.kt index 06d78c10..17648f80 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/StandardJavaPublicationHandler.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/StandardJavaPublicationHandler.kt @@ -57,7 +57,7 @@ import org.gradle.kotlin.dsl.create * The Maven Publish Plugin | Publications * @see CustomPublicationHandler */ -internal class StandardJavaPublicationHandler private constructor( +class StandardJavaPublicationHandler private constructor( project: Project, private val jarFlags: JarFlags, destinations: Set, From e11bdd25d2bb7370f1af8a08e948fa52898c2983 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 9 Dec 2025 19:41:43 +0000 Subject: [PATCH 4/5] Fix object doc --- buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt index a5cce498..fe08dbf8 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt @@ -27,7 +27,7 @@ package io.spine.dependency.local /** - * Dependencies on smaller Spine modules. + * Define Maven groups for the Spine SDK artifacts. */ @Suppress("unused", "ConstPropertyName") object Spine { From 7d1f1846942d0a7e03c29d677df9bc7dbe61e76e Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 10 Dec 2025 15:21:10 +0000 Subject: [PATCH 5/5] Fix doc grammar --- buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt index fe08dbf8..51cdee70 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt @@ -27,7 +27,7 @@ package io.spine.dependency.local /** - * Define Maven groups for the Spine SDK artifacts. + * Defines Maven groups for the Spine SDK artifacts. */ @Suppress("unused", "ConstPropertyName") object Spine {