diff --git a/build.gradle.kts b/build.gradle.kts index 497bce36ff..43b46a1bfb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -53,6 +53,7 @@ buildscript { force( // Make sure we have the right Protobuf Runtime. io.spine.dependency.lib.Protobuf.javaLib, + io.spine.dependency.lib.JetBrainsAnnotations.lib, io.spine.dependency.local.Logging.grpcContext, ) } diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt index 556f37a88e..84c2a2e79e 100644 --- a/buildSrc/src/main/kotlin/BuildExtensions.kt +++ b/buildSrc/src/main/kotlin/BuildExtensions.kt @@ -30,6 +30,7 @@ import io.spine.dependency.build.ErrorProne import io.spine.dependency.build.GradleDoctor import io.spine.dependency.build.Ksp import io.spine.dependency.build.PluginPublishPlugin +import io.spine.dependency.lib.JetBrainsAnnotations import io.spine.dependency.lib.Protobuf import io.spine.dependency.local.Compiler import io.spine.dependency.local.CoreJvmCompiler @@ -39,10 +40,12 @@ import io.spine.dependency.test.Kover import io.spine.gradle.repo.standardToSpineSdk import org.gradle.api.Project import org.gradle.api.Task +import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.tasks.JavaExec import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.ScriptHandlerScope +import org.gradle.kotlin.dsl.exclude import org.gradle.plugin.use.PluginDependenciesSpec import org.gradle.plugin.use.PluginDependencySpec @@ -347,3 +350,22 @@ fun Project.allowDuplicationInSourcesJar() { } } } + +/** + * Excludes `org.jetbrains:annotations` from this published dependency. + * + * Build script classpaths pin the module to the version used by the Kotlin + * runtime embedded into Gradle (`strictly 13.0`, "Pinned to the embedded + * Kotlin"), while `kotlinx-coroutines` and other transitive dependencies of + * this plugin require `23.0.0`. Gradle 9.6 may fail to reconcile the two + * declarations — the outcome depends on the shape of the consumer's dependency + * graph — making the plugin unresolvable without a consumer-side workaround, + * such as forcing the module version on the build script classpath. + * + * The annotations are compile-time metadata, not needed at runtime. + * Consumers still receive version `13.0` through the `kotlin-stdlib` + * dependency, which satisfies the pin. + */ +fun ModuleDependency.excludeJetBrainsAnnotations() { + exclude(group = JetBrainsAnnotations.groupId, module = JetBrainsAnnotations.artifactId) +} 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 d132e6b4e0..753bf24af4 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt @@ -72,7 +72,7 @@ object Compiler : Dependency() { * The version of the Compiler dependencies. */ override val version: String - private const val fallbackVersion = "2.0.0-SNAPSHOT.063" + private const val fallbackVersion = "2.0.0-SNAPSHOT.064" /** * The distinct version of the Compiler used by other build tools. @@ -81,7 +81,7 @@ object Compiler : Dependency() { * transitive dependencies, this is the version used to build the project itself. */ val dogfoodingVersion: String - private const val fallbackDfVersion = "2.0.0-SNAPSHOT.063" + private const val fallbackDfVersion = "2.0.0-SNAPSHOT.064" /** * The artifact for the Compiler 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 9a92fe8b0f..933d57e62e 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.450" + const val version = "2.0.0-SNAPSHOT.460" const val group = Spine.toolsGroup private const val prefix = "validation" diff --git a/config b/config index 91e13d433c..c93dbeed72 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 91e13d433c0e892f4cb48c7575bb05899018974d +Subproject commit c93dbeed7283ca9feb7f5f01a9ad17f8dfe2c5a3 diff --git a/docs/_examples b/docs/_examples index a4964d75b7..6c3382f8a2 160000 --- a/docs/_examples +++ b/docs/_examples @@ -1 +1 @@ -Subproject commit a4964d75b70c93e433ecfce09702f01a93894432 +Subproject commit 6c3382f8a2e761c6ebe576578cbf5657e7eb4671 diff --git a/docs/_time b/docs/_time index 0d0251c149..4daeedfb6a 160000 --- a/docs/_time +++ b/docs/_time @@ -1 +1 @@ -Subproject commit 0d0251c1495f4dc5a383ef2d6b8b2a0e405a327d +Subproject commit 4daeedfb6a1f961c0fa8dc3692b330d370dbfbbc diff --git a/docs/content/docs/validation/developer/build-and-release.md b/docs/content/docs/validation/developer/build-and-release.md index cf2c350e09..80987bfc21 100644 --- a/docs/content/docs/validation/developer/build-and-release.md +++ b/docs/content/docs/validation/developer/build-and-release.md @@ -47,7 +47,7 @@ through Gradle's `extra` properties: end="validationVersion"> ```kotlin -extra.set("validationVersion", "2.0.0-SNAPSHOT.449") +extra.set("validationVersion", "2.0.0-SNAPSHOT.461") ``` The root build script applies this file under `allprojects { … }` and assigns diff --git a/docs/content/docs/validation/user/01-getting-started/adding-to-build.md b/docs/content/docs/validation/user/01-getting-started/adding-to-build.md index 05a792cfdc..82ae434179 100644 --- a/docs/content/docs/validation/user/01-getting-started/adding-to-build.md +++ b/docs/content/docs/validation/user/01-getting-started/adding-to-build.md @@ -90,7 +90,7 @@ Add the Validation plugin to the build. ```kotlin plugins { module - id("io.spine.validation") version "2.0.0-SNAPSHOT.446" + id("io.spine.validation") version "2.0.0-SNAPSHOT.461" } ``` @@ -120,7 +120,7 @@ adding Validation directly. CoreJvm brings in the Validation Gradle plugin for y ```kotlin plugins { module - id("io.spine.core-jvm") version "2.0.0-SNAPSHOT.068" + id("io.spine.core-jvm") version "2.0.0-SNAPSHOT.080" } ``` diff --git a/docs/dependencies/dependencies.md b/docs/dependencies/dependencies.md index 6a90c29534..336d3079ee 100644 --- a/docs/dependencies/dependencies.md +++ b/docs/dependencies/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.tools:validation-context:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-context:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -1105,14 +1105,14 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:11 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:validation-context-tests:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-context-tests:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -1825,14 +1825,14 @@ This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-docs:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-docs:2.0.0-SNAPSHOT.461` ## Runtime ## Compile, tests, and tooling @@ -1842,14 +1842,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:03 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:09 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:validation-gradle-plugin:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-gradle-plugin:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -2888,14 +2888,14 @@ This report was generated on **Sat Jul 25 18:34:03 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:11 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:validation-java:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-java:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -4000,14 +4000,14 @@ This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:11 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:validation-java-bundle:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-java-bundle:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : org.jetbrains. **Name** : annotations. **Version** : 13.0. @@ -4057,14 +4057,14 @@ This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:03 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:09 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:validation-java-settings:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-java-settings:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -4863,14 +4863,14 @@ This report was generated on **Sat Jul 25 18:34:03 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:11 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:spine-validation-jvm-runtime:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine:spine-validation-jvm-runtime:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -5689,14 +5689,14 @@ This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:11 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:validation-consumer:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-consumer:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -6376,14 +6376,14 @@ This report was generated on **Sat Jul 25 18:34:05 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-consumer-dependency:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-consumer-dependency:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -6839,14 +6839,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-extensions:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-extensions:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -7459,14 +7459,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-runtime:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-runtime:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -8025,14 +8025,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-time:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-time:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -8456,14 +8456,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-validating:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-validating:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -9069,14 +9069,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-validator:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-validator:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.22.1. @@ -9808,14 +9808,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-validator-dependency:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-validator-dependency:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -10050,14 +10050,14 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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:validation-vanilla:2.0.0-SNAPSHOT.460` +# Dependencies of `io.spine.tools:validation-vanilla:2.0.0-SNAPSHOT.461` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -10402,6 +10402,6 @@ This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Jul 25 18:34:04 WEST 2026** using +This report was generated on **Mon Aug 03 17:28:10 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 0588a4e485..5f0fb3377a 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 validation -2.0.0-SNAPSHOT.460 +2.0.0-SNAPSHOT.461 2015 @@ -74,43 +74,43 @@ all modules and does not describe the project structure per-subproject. io.spine spine-validation-jvm-runtime - 2.0.0-SNAPSHOT.450 + 2.0.0-SNAPSHOT.460 compile io.spine.tools compiler-api - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 compile io.spine.tools compiler-backend - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 compile io.spine.tools compiler-gradle-api - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 compile io.spine.tools compiler-gradle-plugin - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 compile io.spine.tools compiler-jvm - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 compile io.spine.tools compiler-params - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 compile @@ -200,7 +200,7 @@ all modules and does not describe the project structure per-subproject. io.spine.tools compiler-testlib - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 test @@ -267,12 +267,12 @@ all modules and does not describe the project structure per-subproject. io.spine.tools compiler-cli-all - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 io.spine.tools compiler-protoc-plugin - 2.0.0-SNAPSHOT.063 + 2.0.0-SNAPSHOT.064 io.spine.tools @@ -297,7 +297,7 @@ all modules and does not describe the project structure per-subproject. io.spine.tools validation-java-bundle - 2.0.0-SNAPSHOT.450 + 2.0.0-SNAPSHOT.460 net.sourceforge.pmd diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index e40a115128..9e043b5a89 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -86,14 +86,23 @@ dependencies { // exercises the Spine Compiler Gradle plugin, which references // `org.gradle.kotlin.dsl` extensions. testImplementation(gradleKotlinDsl()) - implementation(Protobuf.GradlePlugin.lib) - implementation(Base.format) - implementation(Compiler.api) - implementation(Compiler.params) - implementation(Compiler.pluginLib) - implementation(Compiler.gradleApi) - implementation(ToolBase.jvmTools) - implementation(project(":java-settings")) + + arrayOf( + Protobuf.GradlePlugin.lib, + Base.format, + Compiler.api, + Compiler.params, + Compiler.pluginLib, + Compiler.gradleApi, + ToolBase.jvmTools + ).forEach { + implementation(it) { + excludeJetBrainsAnnotations() + } + } + implementation(project(":java-settings")) { + excludeJetBrainsAnnotations() + } } // Change the `artifactId` to have the `validation-` prefix. diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index f4fa4f114e..25132db1d8 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -39,6 +39,13 @@ import io.spine.gradle.report.license.LicenseReporter buildscript { forceCodegenPlugins() + configurations.all { + resolutionStrategy { + force( + io.spine.dependency.lib.JetBrainsAnnotations.lib, + ) + } + } } plugins { diff --git a/tests/validator/build.gradle.kts b/tests/validator/build.gradle.kts index 528d6222ec..6531a2fb7a 100644 --- a/tests/validator/build.gradle.kts +++ b/tests/validator/build.gradle.kts @@ -29,6 +29,13 @@ import io.spine.gradle.report.license.LicenseReporter buildscript { forceCodegenPlugins() + configurations.all { + resolutionStrategy { + force( + io.spine.dependency.lib.JetBrainsAnnotations.lib, + ) + } + } } plugins { diff --git a/version.gradle.kts b/version.gradle.kts index 80b553d7f3..453c66c45e 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -27,4 +27,4 @@ /** * The version of the Validation library to publish. */ -extra.set("validationVersion", "2.0.0-SNAPSHOT.460") +extra.set("validationVersion", "2.0.0-SNAPSHOT.461")