Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
Expand Down
22 changes: 22 additions & 0 deletions buildSrc/src/main/kotlin/BuildExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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.
*/
Comment on lines +354 to +368
fun ModuleDependency.excludeJetBrainsAnnotations() {
exclude(group = JetBrainsAnnotations.groupId, module = JetBrainsAnnotations.artifactId)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/_examples
2 changes: 1 addition & 1 deletion docs/_time
Submodule _time updated 383 files
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ through Gradle's `extra` properties:
end="validationVersion">
</embed-code>
```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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
```

Expand Down Expand Up @@ -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"
}
```

Expand Down
Loading
Loading