From 52190ccf3e16b88d3375b1b6b36ff73c403be8e3 Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Tue, 1 Sep 2026 14:43:28 +0100 Subject: [PATCH 1/4] Bump version -> `0.17.2` --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index fa2b4cd..7e57e90 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. */ -extra.set("versionToPublish", "0.17.1") +extra.set("versionToPublish", "0.17.2") From 135a204dbda4822bb2dcec35ed18624ca4ac008d Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Tue, 1 Sep 2026 15:15:12 +0100 Subject: [PATCH 2/4] Address Gradle 9.6 API deprecations Replace the deprecated Kotlin DSL property-delegate APIs with the configuration-avoidance equivalents: * `by tasks.registering` -> `tasks.register(name)`; * `by tasks.getting` -> `tasks.named(name)`; * `by getting(JvmTestSuite::class)` -> `named(name)`; * `by extra` -> `extra[name] as String`. Also drop the `idea` plugin. It is deprecated in Gradle 9.7 and scheduled for removal in Gradle 10. The plugin was applied but never configured, and IntelliJ IDEA imports the project natively, so its generated files were unused. Dropping it retires the `notCompatibleWithConfigurationCache` workaround for `ideaModule` (see https://github.com/gradle/gradle/issues/13480). Co-Authored-By: Claude Opus 5 --- build.gradle.kts | 1 - buildSrc/src/main/kotlin/module.gradle.kts | 3 +- .../kotlin/version-to-resources.gradle.kts | 2 +- gradle-plugin/build.gradle.kts | 30 ++++++++----------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9e938da..46c0ecf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,6 @@ buildscript { } plugins { - idea jacoco `project-report` `gradle-doctor` diff --git a/buildSrc/src/main/kotlin/module.gradle.kts b/buildSrc/src/main/kotlin/module.gradle.kts index 58133cd..7b7e4c8 100644 --- a/buildSrc/src/main/kotlin/module.gradle.kts +++ b/buildSrc/src/main/kotlin/module.gradle.kts @@ -77,7 +77,6 @@ plugins { id("detekt-code-analysis") id("org.jetbrains.kotlinx.kover") id("project-report") - idea } apply() apply() @@ -256,7 +255,7 @@ fun Module.setupTests() { } fun Module.prepareProtocConfigVersionsTask(generatedResources: String) { - val prepareProtocConfigVersions by tasks.registering { + val prepareProtocConfigVersions = tasks.register("prepareProtocConfigVersions") { description = "Prepares the versions.properties file." val propertiesFile = file("$generatedResources/versions.properties") diff --git a/buildSrc/src/main/kotlin/version-to-resources.gradle.kts b/buildSrc/src/main/kotlin/version-to-resources.gradle.kts index 6ac408c..112a7cc 100644 --- a/buildSrc/src/main/kotlin/version-to-resources.gradle.kts +++ b/buildSrc/src/main/kotlin/version-to-resources.gradle.kts @@ -44,7 +44,7 @@ sourceSets { } } -val createVersionFile by tasks.registering { +val createVersionFile = tasks.register("createVersionFile") { inputs.property("version", project.version) outputs.file(versionFile) diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index 79b5f61..5c05c64 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -59,7 +59,7 @@ dependencies { ) testing { suites { - val test by getting(JvmTestSuite::class) { + named("test") { useJUnitJupiter(JUnit.version) dependencies { implementation(Kotlin.GradlePlugin.lib) @@ -75,7 +75,7 @@ testing { * Make functional tests depend on publishing all the submodules to Maven Local so that * the Gradle plugin can get all the dependencies when it's applied to the test projects. */ -val test: Task by tasks.getting { +tasks.named("test") { val task = this rootProject.subprojects.forEach { subproject -> task.dependsOn(":${subproject.name}:publishToMavenLocal") @@ -87,7 +87,7 @@ java { withJavadocJar() } -val shadowJar by tasks.getting(ShadowJar::class) { +tasks.named("shadowJar") { archiveClassifier.set("") exclude( "org/checkerframework/**", @@ -195,26 +195,20 @@ project.afterEvaluate { } // The version declared in `version.gradle.kts`. -val versionToPublish: String by extra - -// Do not attempt to publish snapshot versions to comply with publishing rules. -// See: https://plugins.gradle.org/docs/publish-plugin#approval -val publishPlugins: Task by tasks.getting { - enabled = !versionToPublish.isSnapshot() -} - -val publish: Task by tasks.getting { - dependsOn(publishPlugins) -} +val versionToPublish = extra["versionToPublish"] as String tasks { - ideaModule { - notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13480") - } - publishPlugins { + // Do not attempt to publish snapshot versions to comply with publishing rules. + // See: https://plugins.gradle.org/docs/publish-plugin#approval + enabled = !versionToPublish.isSnapshot() + notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283") } + + named("publish") { + dependsOn(publishPlugins) + } } configureTaskDependencies() From 7b1ffff530803025ae4fc2039492d0c88c2b1089 Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Tue, 1 Sep 2026 15:15:13 +0100 Subject: [PATCH 3/4] Update dependency reports Regenerate the reports for version `0.17.2`. Co-Authored-By: Claude Opus 5 --- docs/dependencies/dependencies.md | 12 ++++++------ docs/dependencies/pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/dependencies/dependencies.md b/docs/dependencies/dependencies.md index 98fb535..3d6f571 100644 --- a/docs/dependencies/dependencies.md +++ b/docs/dependencies/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.tools:prototap-api:0.17.1` +# Dependencies of `io.spine.tools:prototap-api:0.17.2` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -818,14 +818,14 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 29 22:07:07 WEST 2026** using +This report was generated on **Tue Sep 01 14:58:23 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:prototap-gradle-plugin:0.17.1` +# Dependencies of `io.spine.tools:prototap-gradle-plugin:0.17.2` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -1739,14 +1739,14 @@ This report was generated on **Sat Aug 29 22:07:07 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 29 22:07:07 WEST 2026** using +This report was generated on **Tue Sep 01 14:58:23 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:prototap-protoc-plugin:0.17.1` +# Dependencies of `io.spine.tools:prototap-protoc-plugin:0.17.2` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -2564,6 +2564,6 @@ This report was generated on **Sat Aug 29 22:07:07 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 29 22:07:07 WEST 2026** using +This report was generated on **Tue Sep 01 14:58:23 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 9c6fe14..35512e0 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 ProtoTap -0.17.1 +0.17.2 2015 From 477bb904f3cf64f0fdc8c0cac1cef49bc1da5c5b Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Tue, 1 Sep 2026 16:11:00 +0100 Subject: [PATCH 4/4] Use the type-safe `publish` task accessor Replace the string-based `named("publish")` lookup with the generated `publish { }` accessor, matching `publishPlugins { }` in the same `tasks { }` block. Co-Authored-By: Claude Opus 5 --- gradle-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index 5c05c64..46d0dbc 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -206,7 +206,7 @@ tasks { notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283") } - named("publish") { + publish { dependsOn(publishPlugins) } }