From abe1816b397dd818c9afaacddb40bef3f987dac3 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Thu, 2 Apr 2026 20:23:38 +0100 Subject: [PATCH 1/3] Bump version -> `2.0.0-SNAPSHOT.376` --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 6013a95b..d72f29d6 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -24,4 +24,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -val versionToPublish: String by extra("2.0.0-SNAPSHOT.375") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.376") From d327883baab4e4e5c798c548cf5488573f80e055 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Thu, 2 Apr 2026 20:24:02 +0100 Subject: [PATCH 2/3] Add tests for the `sourceJar` dependency --- .../gradle/jvm/plugin/ArtifactMetaPlugin.kt | 5 ++-- .../jvm/plugin/ArtifactMetaPluginSpec.kt | 24 ++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/jvm-tool-plugins/src/main/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPlugin.kt b/jvm-tool-plugins/src/main/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPlugin.kt index 88223e53..233d30d6 100644 --- a/jvm-tool-plugins/src/main/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPlugin.kt +++ b/jvm-tool-plugins/src/main/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPlugin.kt @@ -139,7 +139,7 @@ import org.gradle.kotlin.dsl.register * * Notes: * - Explicitly declared dependencies are merged with those discovered from configurations. - * - Duplicates are de-duplicated, and the list is sorted by the group and artifact ID. + * - Duplicates are deduplicated, and the list is sorted by the group and artifact ID. */ public class ArtifactMetaPlugin : Plugin { @@ -163,7 +163,8 @@ public class ArtifactMetaPlugin : Plugin { it.dependsOn(task) } afterEvaluate { - tasks.findByName(sourcesJar.value())?.dependsOn(task) + val sourcesJarTask = tasks.findByName(sourcesJar.value()) + sourcesJarTask?.dependsOn(task) } // Add the output directory to the resources diff --git a/jvm-tool-plugins/src/test/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPluginSpec.kt b/jvm-tool-plugins/src/test/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPluginSpec.kt index 7c10b6d8..720189ae 100644 --- a/jvm-tool-plugins/src/test/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPluginSpec.kt +++ b/jvm-tool-plugins/src/test/kotlin/io/spine/tools/gradle/jvm/plugin/ArtifactMetaPluginSpec.kt @@ -34,6 +34,8 @@ import io.kotest.matchers.string.shouldNotContain import io.kotest.matchers.string.shouldStartWith import io.spine.tools.gradle.jvm.plugin.ArtifactMetaPlugin.Companion.WORKING_DIR import io.spine.tools.gradle.task.BaseTaskName +import io.spine.tools.gradle.task.JavaTaskName.Companion.processResources +import io.spine.tools.gradle.task.JavaTaskName.Companion.sourcesJar import io.spine.tools.gradle.task.TaskName import io.spine.tools.gradle.testing.Gradle import io.spine.tools.gradle.testing.Gradle.BUILD_SUCCESSFUL @@ -44,7 +46,9 @@ import io.spine.tools.meta.ArtifactMeta.Companion.RESOURCE_DIRECTORY import io.spine.tools.meta.Module import java.io.File import org.gradle.api.Project +import org.gradle.api.internal.project.DefaultProject import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.plugins.JavaPluginExtension import org.gradle.testfixtures.ProjectBuilder import org.gradle.testkit.runner.TaskOutcome import org.junit.jupiter.api.BeforeEach @@ -76,7 +80,7 @@ class ArtifactMetaPluginSpec { } @Test - fun `register WriteDependencies task when applied`() { + fun `register 'WriteArtifactMeta' task when applied`() { project.pluginManager.apply(pluginClass) val task = project.tasks.findByName(WriteArtifactMeta.TASK_NAME) @@ -85,10 +89,10 @@ class ArtifactMetaPluginSpec { } @Test - fun `make 'processResources' depend on the 'writeDependencies' task`() { + fun `make 'processResources' depend on the 'ariteArtifactMeta' task`() { project.pluginManager.apply(pluginClass) - val processResources = project.tasks.getByName("processResources") + val processResources = project.tasks.getByName(processResources.value()) val hasDependency = processResources.dependsOn.any { dep -> dep.toString().contains(WriteArtifactMeta.TASK_NAME) } @@ -96,6 +100,20 @@ class ArtifactMetaPluginSpec { hasDependency shouldBe true } + @Test + fun `make 'sourcesJar' depend on the 'ariteArtifactMeta' task`() { + project.pluginManager.apply(pluginClass) + project.extensions.findByType(JavaPluginExtension::class.java)?.withSourcesJar() + (project as DefaultProject).evaluate() + + val sourcesJar = project.tasks.getByName(sourcesJar.value()) + val hasDependency = sourcesJar.dependsOn.any { + dep -> dep.toString().contains(WriteArtifactMeta.TASK_NAME) + } + + hasDependency shouldBe true + } + /** * Verifies that the file with metadata is created under the `build` directory. */ From 01d2fa32d1e8e8f24d84ef3498b67a8837f218f5 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Thu, 2 Apr 2026 20:28:11 +0100 Subject: [PATCH 3/3] Update dependency reports --- dependencies.md | 56 ++++++++++++++++++++++++------------------------- pom.xml | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dependencies.md b/dependencies.md index 38ba3b33..a1b65472 100644 --- a/dependencies.md +++ b/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.tools:classic-codegen:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:classic-codegen:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -839,14 +839,14 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:37 WET 2026** using +This report was generated on **Thu Apr 02 20:24:24 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:gradle-plugin-api:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:gradle-plugin-api:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -1752,14 +1752,14 @@ This report was generated on **Mon Mar 23 19:47:37 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:gradle-plugin-api-test-fixtures:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:gradle-plugin-api-test-fixtures:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -2230,14 +2230,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:24 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:gradle-root-plugin:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:gradle-root-plugin:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -3095,14 +3095,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:intellij-platform:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:intellij-platform:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -4183,14 +4183,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:37 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:intellij-platform-java:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:intellij-platform-java:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -5969,14 +5969,14 @@ This report was generated on **Mon Mar 23 19:47:37 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:37 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:jvm-tool-plugins:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:jvm-tool-plugins:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -6826,14 +6826,14 @@ This report was generated on **Mon Mar 23 19:47:37 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:jvm-tools:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:jvm-tools:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : org.jetbrains. **Name** : annotations. **Version** : 26.0.2. @@ -7600,14 +7600,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:24 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:plugin-base:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:plugin-base:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -8465,14 +8465,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:24 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:plugin-testlib:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:plugin-testlib:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.auto.value. **Name** : auto-value-annotations. **Version** : 1.10.2. @@ -9434,14 +9434,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:24 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:protobuf-setup-plugins:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:protobuf-setup-plugins:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -10311,14 +10311,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:36 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:psi:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:psi:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -11426,14 +11426,14 @@ This report was generated on **Mon Mar 23 19:47:36 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:37 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:psi-java:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:psi-java:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -13255,14 +13255,14 @@ This report was generated on **Mon Mar 23 19:47:37 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:37 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:tool-base:2.0.0-SNAPSHOT.375` +# Dependencies of `io.spine.tools:tool-base:2.0.0-SNAPSHOT.376` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -14149,6 +14149,6 @@ This report was generated on **Mon Mar 23 19:47:37 WET 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Mar 23 19:47:37 WET 2026** using +This report was generated on **Thu Apr 02 20:24:25 WEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file diff --git a/pom.xml b/pom.xml index 755a141d..43ca0462 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject. --> io.spine.tools tool-base -2.0.0-SNAPSHOT.375 +2.0.0-SNAPSHOT.376 2015