From 7ca9b941d6f77d64ea19baf286f301dff2a4886e Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Mon, 8 Jun 2026 15:00:10 +0100 Subject: [PATCH 1/6] bump version -> `2.0.0-SNAPSHOT.397` --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 14087738..776291ac 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.396") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.397") From 77f98c885feec2af0078280ea39dead9110e1f83 Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Mon, 8 Jun 2026 15:00:34 +0100 Subject: [PATCH 2/6] Bump Base -> `2.0.0-SNAPSHOT.403` --- buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 787b8cfb..cec4631c 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt @@ -34,7 +34,7 @@ package io.spine.dependency.local @Suppress("ConstPropertyName", "unused") object Base { const val version = "2.0.0-SNAPSHOT.400" - const val versionForBuildScript = "2.0.0-SNAPSHOT.400" + const val versionForBuildScript = "2.0.0-SNAPSHOT.403" const val group = Spine.group private const val prefix = "spine" const val libModule = "$prefix-base" From fa9940e160746d90a5f949e61dc459d59e45dc7c Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Mon, 8 Jun 2026 15:10:50 +0100 Subject: [PATCH 3/6] Update dependency reports --- docs/dependencies/dependencies.md | 56 +++++++++++++++---------------- docs/dependencies/pom.xml | 12 +------ 2 files changed, 29 insertions(+), 39 deletions(-) diff --git a/docs/dependencies/dependencies.md b/docs/dependencies/dependencies.md index f82ba465..914f18ea 100644 --- a/docs/dependencies/dependencies.md +++ b/docs/dependencies/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.tools:classic-codegen:2.0.0-SNAPSHOT.396` +# Dependencies of `io.spine.tools:classic-codegen:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -828,14 +828,14 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:gradle-plugin-api:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.0. @@ -1734,14 +1734,14 @@ This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:gradle-plugin-api-test-fixtures:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.0. @@ -2212,14 +2212,14 @@ This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:34 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:gradle-root-plugin:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -3070,14 +3070,14 @@ This report was generated on **Sun Jun 07 19:17:34 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:intellij-platform:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -4151,14 +4151,14 @@ This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:intellij-platform-java:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -5930,14 +5930,14 @@ This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:jvm-tool-plugins:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -6780,14 +6780,14 @@ This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:jvm-tools:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : org.jetbrains. **Name** : annotations. **Version** : 26.1.0. @@ -7547,14 +7547,14 @@ This report was generated on **Sun Jun 07 19:17:35 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:36 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:plugin-base:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -8405,14 +8405,14 @@ This report was generated on **Sun Jun 07 19:17:36 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:plugin-testlib:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.auto.value. **Name** : auto-value-annotations. **Version** : 1.11.1. @@ -9367,14 +9367,14 @@ This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:protobuf-setup-plugins:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -10237,14 +10237,14 @@ This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:psi:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -11345,14 +11345,14 @@ This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:psi-java:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : be.cyberelf.nanoxml. **Name** : nanoxml. **Version** : 2.2.3. @@ -13167,14 +13167,14 @@ This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:38 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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.396` +# Dependencies of `io.spine.tools:tool-base:2.0.0-SNAPSHOT.397` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -14054,6 +14054,6 @@ This report was generated on **Sun Jun 07 19:17:38 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sun Jun 07 19:17:37 WEST 2026** using +This report was generated on **Mon Jun 08 15:00:17 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/docs/dependencies/pom.xml b/docs/dependencies/pom.xml index 263a7b0e..22b5ce53 100644 --- a/docs/dependencies/pom.xml +++ b/docs/dependencies/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.396 +2.0.0-SNAPSHOT.397 2015 @@ -408,11 +408,6 @@ all modules and does not describe the project structure per-subproject. templating-plugin 2.2.0 - - org.jetbrains.kotlin - abi-tools - 2.3.21 - org.jetbrains.kotlin kotlin-assignment-compiler-plugin-embeddable @@ -434,11 +429,6 @@ all modules and does not describe the project structure per-subproject. 2.3.21 provided - - org.jetbrains.kotlin - kotlin-klib-commonizer-embeddable - 2.3.21 - org.jetbrains.kotlin kotlin-reflect From b5ffc9497657e1e8d91e8ec685b079c78832199c Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Mon, 8 Jun 2026 15:11:49 +0100 Subject: [PATCH 4/6] Remove redundant cast --- .../src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt b/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt index 78462898..0d22624c 100644 --- a/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt +++ b/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt @@ -49,9 +49,9 @@ internal class PsiElementExtsSpec { * to a member of `PsiFile`. */ private fun loadClass(tempDir: Path) = - (FileSystem.load(tempDir.resolve("Stub.java").apply { + FileSystem.load(tempDir.resolve("Stub.java").apply { writeText("class Stub {}") - }) as PsiJavaFile).topLevelClass + }).topLevelClass @Test fun `obtain the virtual file of an element`(@TempDir tempDir: Path) { From 2d997704cf2d446c6fa7865f3fc09e9f4954eed9 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 8 Jun 2026 15:40:14 +0000 Subject: [PATCH 5/6] Replace deprecated PMD rule `GenericsNaming` with `TypeParameterNamingConventions` PMD 7.25.0 deprecated `category/java/codestyle.xml/GenericsNaming` (scheduled for removal in PMD 8.0.0) in favour of `TypeParameterNamingConventions`, which enforces the same single uppercase-letter convention for type parameters by default. The `pmdMain` task printed a deprecation warning for the rule; switching to the successor clears it. https://claude.ai/code/session_014TVLouXfDWCg1sTQVW3ssM --- buildSrc/quality/pmd.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/quality/pmd.xml b/buildSrc/quality/pmd.xml index 1d49f901..5e0e88e3 100644 --- a/buildSrc/quality/pmd.xml +++ b/buildSrc/quality/pmd.xml @@ -1,7 +1,7 @@