Skip to content

build: extract dependencies into three Gradle version catalogs #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jGleitz merged 6 commits into from
Mar 29, 2026
Merged

build: extract dependencies into three Gradle version catalogs #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a84a18
Initial plan
Copilot Mar 2, 2026
53f0cb0
Extract all dependencies into 3 Gradle version catalogs
Copilot Mar 2, 2026
57fb33b
Address review: reorder settings, simplify version refs, remove const…
Copilot Mar 2, 2026
a3dbaed
Use single string notation in all catalogs; add version to junit-plat…
Copilot Mar 2, 2026
5430c87
Merge origin/v3: update spek to 2.0.19, atrium to 0.18.0, kotlin-jvm …
Copilot Mar 29, 2026
84a8400
undo stupid password redaction
jGleitz Mar 29, 2026
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
16 changes: 6 additions & 10 deletions base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@ import org.gradle.api.JavaVersion.VERSION_17
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
id("org.jetbrains.dokka")
alias(buildLibs.plugins.kotlin.jvm)
alias(buildLibs.plugins.dokka)
}

val artifactId by extra("testfiles")
val description by extra("Manage test files and directories neatly!")

dependencies {
testImplementation("org.spekframework.spek2:spek-dsl-jvm:2.0.19")
testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:0.18.0")
testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:2.0.19")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

constraints {
testImplementation(kotlin("reflect"))
}
testImplementation(libs.spek.dsl.jvm)
testImplementation(testLibs.atrium.fluent.en.gb)
Comment thread
jGleitz marked this conversation as resolved.
testRuntimeOnly(testLibs.spek.runner.junit5)
testRuntimeOnly(testLibs.junit.platform.launcher)
}

java {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import org.jetbrains.dokka.gradle.DokkaExtension

plugins {
kotlin("jvm") version "2.3.20"
id("org.jetbrains.dokka") version "2.1.0"
id("org.jetbrains.dokka-javadoc") version "2.1.0" apply false
alias(buildLibs.plugins.kotlin.jvm)
alias(buildLibs.plugins.dokka)
alias(buildLibs.plugins.dokka.javadoc) apply false
`maven-publish`
signing
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
alias(buildLibs.plugins.nexus.publish)
idea
}

Expand Down
9 changes: 9 additions & 0 deletions gradle/buildLibs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[versions]
dokka = "2.1.0"

[plugins]
develocity = "com.gradle.develocity:4.3.2"
Comment thread
jGleitz marked this conversation as resolved.
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
kotlin-jvm = "org.jetbrains.kotlin.jvm:2.3.20"
nexus-publish = "io.github.gradle-nexus.publish-plugin:2.0.0"
Comment thread
jGleitz marked this conversation as resolved.
7 changes: 7 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[versions]
spek = "2.0.19"

[libraries]
kotest-framework-api = "io.kotest:kotest-framework-api:4.6.4"
Comment thread
jGleitz marked this conversation as resolved.
spek-dsl-jvm = { module = "org.spekframework.spek2:spek-dsl-jvm", version.ref = "spek" }
spek-runtime-jvm = { module = "org.spekframework.spek2:spek-runtime-jvm", version.ref = "spek" }
5 changes: 5 additions & 0 deletions gradle/testLibs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[libraries]
atrium-fluent-en-gb = "ch.tutteli.atrium:atrium-fluent-en_GB:0.18.0"
junit-platform-launcher = "org.junit.platform:junit-platform-launcher:6.0.3"
kotest-runner-junit5 = "io.kotest:kotest-runner-junit5:4.6.4"
spek-runner-junit5 = "org.spekframework.spek2:spek-runner-junit5:2.0.19"
Comment thread
jGleitz marked this conversation as resolved.
16 changes: 6 additions & 10 deletions kotest/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.gradle.api.JavaVersion.VERSION_17
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
id("org.jetbrains.dokka")
alias(buildLibs.plugins.kotlin.jvm)
alias(buildLibs.plugins.dokka)
}

val artifactId by extra("kotest-files")
Expand All @@ -12,15 +12,11 @@ val description by extra("Manage test files and directories neatly when testing
dependencies {
api(project(":base"))
// Kotest is a peer dependency
compileOnly("io.kotest:kotest-framework-api:4.6.4")
compileOnly(libs.kotest.framework.api)

Comment thread
jGleitz marked this conversation as resolved.
testImplementation("io.kotest:kotest-runner-junit5:4.6.4")
testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:0.18.0")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

constraints {
testImplementation(kotlin("reflect"))
}
testImplementation(testLibs.kotest.runner.junit5)
testImplementation(testLibs.atrium.fluent.en.gb)
testRuntimeOnly(testLibs.junit.platform.launcher)
}

java {
Expand Down
11 changes: 11 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ plugins {
id("com.gradle.develocity") version "4.3.2"
}

dependencyResolutionManagement {
Comment thread
jGleitz marked this conversation as resolved.
versionCatalogs {
create("testLibs") {
from(files("gradle/testLibs.versions.toml"))
}
create("buildLibs") {
from(files("gradle/buildLibs.versions.toml"))
}
}
}
Comment thread
jGleitz marked this conversation as resolved.

include("base", "kotest", "spek")

develocity {
Expand Down
20 changes: 8 additions & 12 deletions spek/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,23 @@ import org.gradle.api.JavaVersion.VERSION_17
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
id("org.jetbrains.dokka")
alias(buildLibs.plugins.kotlin.jvm)
alias(buildLibs.plugins.dokka)
}

val artifactId by extra("spek-testfiles")
val description by extra("Manage test files and directories neatly when testing with Spek!")

dependencies {
// Spek is a peer dependency
compileOnly("org.spekframework.spek2:spek-dsl-jvm:2.0.19")
compileOnly("org.spekframework.spek2:spek-runtime-jvm:2.0.19")
compileOnly(libs.spek.dsl.jvm)
compileOnly(libs.spek.runtime.jvm)

api(project(":base"))
testImplementation("org.spekframework.spek2:spek-dsl-jvm:2.0.19")
testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:0.18.0")
testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:2.0.19")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

constraints {
testImplementation(kotlin("reflect"))
}
testImplementation(libs.spek.dsl.jvm)
testImplementation(testLibs.atrium.fluent.en.gb)
Comment thread
jGleitz marked this conversation as resolved.
testRuntimeOnly(testLibs.spek.runner.junit5)
testRuntimeOnly(testLibs.junit.platform.launcher)
}

java {
Expand Down
Loading