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 73ef7537e0..717165d5c3 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt @@ -26,6 +26,8 @@ package io.spine.dependency.local +import io.spine.dependency.Dependency + /** * Dependencies on the Spine Compiler modules. * @@ -56,9 +58,9 @@ package io.spine.dependency.local "ConstPropertyName" /* We use custom convention for artifact properties. */, "MemberVisibilityCanBePrivate" /* The properties are used directly by other subprojects. */, ) -object Compiler { +object Compiler : Dependency() { const val pluginGroup = Spine.group - const val group = "io.spine.tools" + override val group = "io.spine.tools" const val pluginId = "io.spine.compiler" /** @@ -69,7 +71,7 @@ object Compiler { /** * The version of the Compiler dependencies. */ - val version: String + override val version: String private const val fallbackVersion = "2.0.0-SNAPSHOT.035" /** @@ -129,6 +131,9 @@ object Compiler { val testlib get() = "$group:compiler-testlib:$version" + override val modules: List + get() = listOf(api, backend, params, protocPlugin, gradleApi, cliApi, jvm, fatCli, testlib) + /** * An env variable storing a custom [version]. */ 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 5be81a7c42..10670865e9 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt @@ -47,7 +47,10 @@ object Validation { private const val prefix = "validation" const val runtimeModule = "${Spine.group}:spine-$prefix-jvm-runtime" - const val runtime = "$runtimeModule:$version" + + fun runtime(version: String) = "$runtimeModule:$version" + val runtime = runtime(version) + const val javaModule = "$group:$prefix-java" const val java = "$javaModule:$version" diff --git a/dependencies.md b/dependencies.md index 5b265f9a32..34ebfcf9f4 100644 --- a/dependencies.md +++ b/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.tools:validation-gradle-plugin:2.0.0-SNAPSHOT.374` +# Dependencies of `io.spine.tools:validation-gradle-plugin:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -1069,14 +1069,14 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-java:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -2163,16 +2163,24 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-java-bundle:2.0.0-SNAPSHOT.375` ## Runtime +1. **Group** : com.google.auto.service. **Name** : auto-service-annotations. **Version** : 1.1.1. + * **Project URL:** [https://github.com/google/auto/tree/main/service](https://github.com/google/auto/tree/main/service) + * **License:** [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) + +1. **Group** : com.google.devtools.ksp. **Name** : symbol-processing-api. **Version** : 2.3.0. + * **Project URL:** [https://goo.gle/ksp](https://goo.gle/ksp) + * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) + 1. **Group** : org.jetbrains. **Name** : annotations. **Version** : 26.0.2. * **Project URL:** [https://github.com/JetBrains/java-annotations](https://github.com/JetBrains/java-annotations) * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) @@ -2264,6 +2272,10 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using * **Project URL:** [https://github.com/google/gson](https://github.com/google/gson) * **License:** [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) +1. **Group** : com.google.devtools.ksp. **Name** : symbol-processing-api. **Version** : 2.3.0. + * **Project URL:** [https://goo.gle/ksp](https://goo.gle/ksp) + * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) + 1. **Group** : com.google.errorprone. **Name** : error_prone_annotation. **Version** : 2.36.0. * **Project URL:** [https://errorprone.info/error_prone_annotation](https://errorprone.info/error_prone_annotation) * **License:** [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -2936,14 +2948,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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:validation-jvm-runtime:2.0.0-SNAPSHOT.374` +# Dependencies of `io.spine:validation-jvm-runtime:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -3792,14 +3804,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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-ksp:2.0.0-SNAPSHOT.374` +# Dependencies of `io.spine.tools:validation-ksp:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.auto.service. **Name** : auto-service-annotations. **Version** : 1.1.1. @@ -4744,14 +4756,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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-model:2.0.0-SNAPSHOT.374` +# Dependencies of `io.spine.tools:validation-model:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -5838,14 +5850,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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-configuration:2.0.0-SNAPSHOT.374` +# Dependencies of `io.spine.tools:validation-configuration:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -6963,14 +6975,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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:2.0.0-SNAPSHOT.374` +# Dependencies of `io.spine.tools:validation-context:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -8092,14 +8104,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-consumer:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -9186,14 +9198,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-consumer-dependency:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -10183,14 +10195,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-extensions:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -11333,14 +11345,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-runtime:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -12330,14 +12342,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-validating:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -13331,14 +13343,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:01 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-validator:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0. @@ -14429,14 +14441,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-validator-dependency:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -15261,14 +15273,14 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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.374` +# Dependencies of `io.spine.tools:validation-vanilla:2.0.0-SNAPSHOT.375` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -16202,6 +16214,6 @@ This report was generated on **Thu Dec 11 20:30:15 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 11 20:30:15 WET 2025** using +This report was generated on **Mon Dec 15 18:51:00 WET 2025** 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/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index 6cf981cedd..6fefc0ee14 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -38,14 +38,17 @@ plugins { val moduleArtifactId = "validation-gradle-plugin" +apply(from = "$rootDir/version.gradle.kts") + +val validationVersion: String by extra + artifactMeta { artifactId.set(moduleArtifactId) addDependencies( // Add Validation module dependencies that we use for project configuration // to which the Validation Gradle Plugin is applied. - Validation.javaBundle, - Validation.runtime, - Validation.configuration, + Validation.javaBundle(validationVersion), + Validation.runtime(validationVersion), ) excludeConfigurations { containing(*buildToolConfigurations) diff --git a/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationGradlePlugin.kt b/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationGradlePlugin.kt index 7f79727788..48bb5f90bd 100644 --- a/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationGradlePlugin.kt +++ b/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationGradlePlugin.kt @@ -28,10 +28,13 @@ package io.spine.tools.validation.gradle import io.spine.tools.compiler.gradle.api.compilerSettings import io.spine.tools.compiler.gradle.api.addUserClasspathDependency +import io.spine.tools.compiler.gradle.plugin.Extension import io.spine.tools.gradle.DslSpec import io.spine.tools.gradle.lib.LibraryPlugin import io.spine.tools.gradle.lib.spineExtension +import io.spine.tools.meta.MavenArtifact import org.gradle.api.Project +import org.gradle.api.artifacts.Dependency /** * Gradle plugin that configures the Spine Compiler to run the Validation Compiler. @@ -41,16 +44,29 @@ public class ValidationGradlePlugin : LibraryPlugin( ) { override fun apply(project: Project) { super.apply(project) - val version = Meta.version - val javaBundle = ValidationSdk.javaCodegenBundle(version) + val javaBundle = ValidationSdk.javaCodegenBundle project.run { addUserClasspathDependency(javaBundle) afterEvaluate { // Add the Validation Java Compiler only if `spine/validation/enabled` is true. if (validationExtension.enabled.get()) { - compilerSettings.plugins(ValidationSdk.javaCompilerPlugin) + (compilerSettings as Extension).run { + // Put the Validation Java Compiler first in the list of the plugins. + // Other plugins may rely on the validation code. + val ordered = listOf(ValidationSdk.javaCompilerPlugin) + plugins.get() + plugins.set(ordered) + } } } + // We add the dependency on runtime anyway for the following reasons: + // 1. We do not want users to change their Gradle build files when they turn on or off + // code generation for the validation code. + // + // 2. We have run-time validation rules that are going to be used in parallel with + // the generated code. This includes current and new implementation for validation + // rules for the already existing generated Protobuf code. + // + addDependency("implementation", ValidationSdk.jvmRuntime) } } } @@ -60,3 +76,17 @@ public class ValidationGradlePlugin : LibraryPlugin( */ private val Project.validationExtension: ValidationExtension get() = spineExtension() + +private fun Project.addDependency(configuration: String, artifact: MavenArtifact) { + val dependency = findDependency(artifact) ?: artifact.coordinates + dependencies.add(configuration, dependency) +} + +private fun Project.findDependency(artifact: MavenArtifact): Dependency? { + val dependencies = configurations.flatMap { c -> c.dependencies } + val found = dependencies.firstOrNull { d -> + artifact.group == d.group // `d.group` could be `null`. + && artifact.name == d.name + } + return found +} diff --git a/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationSdk.kt b/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationSdk.kt index e0384c107b..2f090af083 100644 --- a/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationSdk.kt +++ b/gradle-plugin/src/main/kotlin/io/spine/tools/validation/gradle/ValidationSdk.kt @@ -39,52 +39,25 @@ internal object ValidationSdk { private const val toolsGroup = "io.spine.tools" private const val prefix = "validation" - private val jvmRuntime = Module("io.spine", "spine-$prefix-jvm-runtime") - - private val javaCodegenBundle = Module(toolsGroup, "$prefix-java-bundle") - private val configuration = Module(toolsGroup, "$prefix-configuration") - - private fun MavenArtifact.withVersion(version: String): MavenArtifact { - version.ifEmpty { - return this - } - return MavenArtifact(group, name, version, classifier, extension) - } - /** - * The fully qualified name of the Validation Java Compiler plugin. - */ - internal const val javaCompilerPlugin = "io.spine.tools.validation.java.JavaValidationPlugin" - - /** - * The Maven artifact containing the `io.spine.tools:validation-java-bundle` module. + * The Maven artifact containing the `io.spine:spine-validation-jvm-runtime` module. * - * @param version The version of the Validation library to be used. - * If empty, the version of the build-time dependency is used. + * @see javaCodegenBundle */ - @JvmStatic - public fun javaCodegenBundle(version: String = ""): MavenArtifact = - Meta.dependency(javaCodegenBundle).withVersion(version) + val jvmRuntime: MavenArtifact = Meta.dependency( + Module("io.spine", "spine-$prefix-jvm-runtime") + ) /** - * The Maven artifact containing the `io.spine:spine-validation-jvm-runtime` module. - * - * @param version The version of the Validation library to be used. - * If empty, the version of the build-time dependency is used. - * @see javaCodegenBundle + * The Maven artifact containing the `io.spine.tools:validation-java-bundle` module. */ - @JvmStatic - public fun jvmRuntime(version: String = ""): MavenArtifact = - Meta.dependency(jvmRuntime).withVersion(version) + val javaCodegenBundle: MavenArtifact = Meta.dependency( + Module(toolsGroup, "$prefix-java-bundle") + ) /** - * The Maven artifact containing the `io.spine.tools:validation-configuration` module. - * - * @param version The version of the Validation library to be used. - * If empty, the version of the build-time dependency is used. - * @see javaCodegenBundle + * The fully qualified name of the Validation Java Compiler plugin. */ - @JvmStatic - public fun configuration(version: String = ""): MavenArtifact = - Meta.dependency(configuration).withVersion(version) + const val javaCompilerPlugin: String = + "io.spine.tools.validation.java.JavaValidationPlugin" } diff --git a/java-bundle/build.gradle.kts b/java-bundle/build.gradle.kts index c43bf03474..6ee67f8bbd 100644 --- a/java-bundle/build.gradle.kts +++ b/java-bundle/build.gradle.kts @@ -56,13 +56,17 @@ dependencies { ErrorProne.group, Grpc.group /* Available via ProtoData backend. */, Roaster.group /* Available via `tool-base`. */, - - // Local dependencies. - Compiler.group, ).forEach { exclude(group = it) } + // Transitive dependencies to the Compiler. + Compiler.modules.forEach { + it.split(":").let { (group, artifact, _) -> + exclude(group = group, module = artifact) + } + } + listOf( JavaPoet.group to JavaPoet.artifact /* Available via `tool-base` */, diff --git a/pom.xml b/pom.xml index be02a34074..b0d4d6677e 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 validation -2.0.0-SNAPSHOT.374 +2.0.0-SNAPSHOT.375 2015 diff --git a/version.gradle.kts b/version.gradle.kts index 3a00835ba1..856f090b82 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,4 +29,4 @@ * * For Spine-based dependencies please see [io.spine.dependency.local.Spine]. */ -val validationVersion by extra("2.0.0-SNAPSHOT.374") +val validationVersion by extra("2.0.0-SNAPSHOT.375")