Apply new publishing #286
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||
| /* | ||||||
| * Copyright 2026, 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. | ||||||
|
|
@@ -26,18 +26,43 @@ | |||||
|
|
||||||
| package io.spine.dependency.local | ||||||
|
|
||||||
| import io.spine.dependency.Dependency | ||||||
|
|
||||||
| /** | ||||||
| * Spine Time library. | ||||||
| * | ||||||
| * @see <a href="https://github.com/SpineEventEngine/time">spine-time</a> | ||||||
| */ | ||||||
| @Suppress( | ||||||
| "unused" /* Some subprojects do not use all Time artifacts. */, | ||||||
| "ConstPropertyName" /* We use custom convention for artifact properties. */, | ||||||
| "MemberVisibilityCanBePrivate" /* The properties are used directly by other subprojects. */, | ||||||
| ) | ||||||
| object Time : Dependency() { | ||||||
| override val group = Spine.group | ||||||
| override val version = "2.0.0-SNAPSHOT.235" | ||||||
| private const val infix = "spine-time" | ||||||
|
|
||||||
| fun lib(version: String): String = "$group:$infix:$version" | ||||||
| val lib get() = lib(version) | ||||||
| const val libArtifact: String = infix | ||||||
|
|
||||||
| fun javaExtensions(version: String): String = "$group:$infix-java:$version" | ||||||
| val javaExtensions get() = javaExtensions(version) | ||||||
|
|
||||||
| fun kotlinExtensions(version: String): String = "$group:$infix-kotlin:$version" | ||||||
| val kotlinExtensions get() = kotlinExtensions(version) | ||||||
|
|
||||||
| fun testLib(version: String): String = "${Spine.toolsGroup}:time-testlib:$version" | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| val testLib get() = testLib(version) | ||||||
|
|
||||||
| override val modules: List<String> | ||||||
| get() = listOf( | ||||||
| lib, | ||||||
| javaExtensions, | ||||||
| kotlinExtensions, | ||||||
| testLib | ||||||
| ).map { | ||||||
| it.split(":").let { (g, artifact) -> "$g:$artifact" } | ||||||
| } | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||
| /* | ||||||
| * Copyright 2026, 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. | ||||||
|
|
@@ -29,6 +29,7 @@ | |||||
| package io.spine.gradle.publish | ||||||
|
|
||||||
| import io.spine.gradle.repo.Repository | ||||||
| import java.util.Locale | ||||||
| import org.gradle.api.Project | ||||||
| import org.gradle.api.publish.maven.plugins.MavenPublishPlugin | ||||||
| import org.gradle.kotlin.dsl.apply | ||||||
|
|
@@ -145,16 +146,18 @@ import org.gradle.kotlin.dsl.findByType | |||||
| * @see [artifacts] | ||||||
| * @see SpinePublishing | ||||||
| */ | ||||||
| fun Project.spinePublishing(block: SpinePublishing.() -> Unit): SpinePublishing { | ||||||
| apply<MavenPublishPlugin>() | ||||||
| val name = SpinePublishing::class.java.simpleName | ||||||
| .replaceFirstChar { it.lowercase(Locale.getDefault()) } | ||||||
|
There was a problem hiding this comment. Using
Suggested change
|
||||||
| val extension = with(extensions) { | ||||||
| findByType<SpinePublishing>() ?: create(name, project) | ||||||
| } | ||||||
| extension.run { | ||||||
| block() | ||||||
| configured() | ||||||
| } | ||||||
| return extension | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -182,6 +185,12 @@ open class SpinePublishing(private val project: Project) { | |||||
| * The default prefix added before a module name when publishing artifacts. | ||||||
| */ | ||||||
| const val DEFAULT_PREFIX = "spine-" | ||||||
|
|
||||||
| /** | ||||||
| * The reserved value that means that no prefix should be added | ||||||
| * to a tool module's artifact ID. | ||||||
| */ | ||||||
| const val NONE_PREFIX = "NONE" | ||||||
| } | ||||||
|
|
||||||
| private val testJar = TestJar() | ||||||
|
|
@@ -250,10 +259,23 @@ open class SpinePublishing(private val project: Project) { | |||||
| lateinit var destinations: Set<Repository> | ||||||
|
|
||||||
| /** | ||||||
| * A prefix to be added before the name of each artifact, if it does not belong | ||||||
| * to the Maven group `"io.spine.tools"`. | ||||||
| * | ||||||
| * @see toolArtifactPrefix | ||||||
| */ | ||||||
| var artifactPrefix: String = DEFAULT_PREFIX | ||||||
|
|
||||||
| /** | ||||||
| * A prefix to be added before a module name if it belongs to | ||||||
| * the Maven group `"io.spine.tools"`. | ||||||
| * | ||||||
| * Use `"NONE"` if you need no prefix before tool module names. | ||||||
| * | ||||||
| * @see artifactPrefix | ||||||
| */ | ||||||
| var toolArtifactPrefix: String = "" | ||||||
|
There was a problem hiding this comment.
This adds Useful? React with 👍 / 👎. |
||||||
|
|
||||||
| /** | ||||||
| * Allows enabling publishing of [testJar] artifact, containing compilation output | ||||||
| * of "test" source set. | ||||||
|
|
@@ -389,10 +411,26 @@ open class SpinePublishing(private val project: Project) { | |||||
| /** | ||||||
| * Obtains an artifact ID for the given project. | ||||||
| * | ||||||
| * @see artifactPrefix | ||||||
| * @see toolArtifactPrefix | ||||||
| */ | ||||||
| fun artifactId(project: Project): String { | ||||||
| if (project.isTool) { | ||||||
| check(!toolArtifactPrefix.isEmpty()) { | ||||||
| "Artifact prefix cannot be empty for tool modules. " + | ||||||
| "Please set the `toolArtifactPrefix` property in `spinePublishing`. " + | ||||||
| "Use `\"NONE\"` to have an empty prefix for tool modules." | ||||||
| } | ||||||
| val prefix = | ||||||
| if (toolArtifactPrefix == NONE_PREFIX) { "" } | ||||||
| else { toolArtifactPrefix } | ||||||
| return "$prefix${project.name}" | ||||||
| } | ||||||
| return "$artifactPrefix${project.name}" | ||||||
| } | ||||||
|
|
||||||
| private val Project.isTool: Boolean | ||||||
| get() = group == "io.spine.tools" | ||||||
|
|
||||||
| /** | ||||||
| * Ensures that all modules, marked as included into [testJar] publishing, | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Setting the root
artifactPrefixtospine-validation-causesjvm-runtimeto generate a doubled artifact ID becausejvm-runtime/build.gradle.ktsalready doesartifactId = "$defaultPrefix$projectPrefix${project.name}"withdefaultPrefix = "spine-"; this now resolves tospine-spine-validation-jvm-runtime. That will publish runtime under an unexpected coordinate and break consumers expectingspine-validation-jvm-runtime.Useful? React with 👍 / 👎.