Skip to content

Commit 37ba2b6

Browse files
jpenillajpenilla
committed
Move version catalog to toml for better compatibility with external tooling
1 parent 0f261d9 commit 37ba2b6

10 files changed

Lines changed: 146 additions & 297 deletions

File tree

‎build-logic/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
`kotlin-dsl`
3-
id("com.diffplug.spotless")
3+
alias(libs.plugins.spotless)
44
}
55

66
repositories {

‎build-logic/settings.gradle.kts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import ca.stellardrift.build.configurate.ConfigFormats
2-
import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
3-
4-
plugins {
5-
id("ca.stellardrift.polyglot-version-catalogs") version "6.0.1"
6-
}
7-
8-
extensions.configure<PolyglotVersionCatalogExtension> {
9-
from(ConfigFormats.YAML, file("../gradle/libs.versions.yml"))
1+
dependencyResolutionManagement {
2+
versionCatalogs {
3+
create("libs") {
4+
from(files("../gradle/libs.versions.toml"))
5+
}
6+
}
107
}

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("cloud.parent-build-logic")
3-
id("com.github.ben-manes.versions")
3+
alias(libs.plugins.versions)
44
}
55

66
subprojects {

‎examples/example-bukkit/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import xyz.jpenilla.runpaper.task.RunServer
22

33
plugins {
44
id("cloud.example-conventions")
5-
id("com.github.johnrengelman.shadow")
6-
id("xyz.jpenilla.run-paper")
5+
alias(libs.plugins.shadow)
6+
alias(libs.plugins.run.paper)
77
}
88

99
dependencies {

‎examples/example-bungee/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("cloud.example-conventions")
3-
id("com.github.johnrengelman.shadow")
4-
id("xyz.jpenilla.run-waterfall")
3+
alias(libs.plugins.shadow)
4+
alias(libs.plugins.run.waterfall)
55
}
66

77
tasks {

‎examples/example-jda/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
application
33
id("cloud.example-conventions")
4-
id("com.github.johnrengelman.shadow")
4+
alias(libs.plugins.shadow)
55
}
66

77
application {

‎examples/example-velocity/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("com.github.johnrengelman.shadow")
2+
alias(libs.plugins.shadow)
33
id("cloud.example-conventions")
4-
id("xyz.jpenilla.run-velocity")
4+
alias(libs.plugins.run.velocity)
55
}
66

77
indra {

‎gradle/libs.versions.toml‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
[plugins]
2+
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
3+
versions = { id = "com.github.ben-manes.versions", version = "0.48.0" }
4+
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
5+
run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-task" }
6+
run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-task" }
7+
run-waterfall = { id = "xyz.jpenilla.run-waterfall", version.ref = "run-task" }
8+
9+
[versions]
10+
run-task = "2.2.0"
11+
checkstyle = "10.5.0"
12+
checkerQual = "3.38.0"
13+
errorprone = "2.16"
14+
geantyref = "1.3.14"
15+
jmh = "1.36"
16+
apiguardian = "1.1.2"
17+
18+
# integration
19+
guice = "4.2.3"
20+
21+
# kotlin
22+
kotlin = "1.7.22"
23+
dokka = "1.7.20"
24+
coroutines = "1.5.2"
25+
ktlint = "0.50.0"
26+
27+
# discord
28+
javacord = "3.1.1"
29+
jda = "4.2.1_257"
30+
31+
# irc
32+
pircbotx = "12f5639c5d"
33+
34+
# minecraft
35+
guava = "21.0-jre"
36+
brigadier = "1.0.17"
37+
bukkit = "1.13.2-R0.1-SNAPSHOT"
38+
commodore = "2.2"
39+
bungeecord = "1.8-SNAPSHOT"
40+
cloudburst = "1.0.0-SNAPSHOT"
41+
adventureApi = "4.9.3"
42+
adventurePlatform = "4.1.1"
43+
paperApi = "1.16.5-R0.1-SNAPSHOT"
44+
velocityApi = "3.1.0"
45+
spongeApi7 = "7.3.0"
46+
jetbrainsAnnotations = "23.0.0"
47+
fabricMinecraft = "1.19.4"
48+
fabricLoader = "0.14.22"
49+
fabricApi = "0.87.0+1.19.4"
50+
fabricPermissionsApi = "0.2-SNAPSHOT"
51+
52+
# testing
53+
jupiterEngine = "5.10.0"
54+
mockitoCore = "4.9.0"
55+
mockitoKotlin = "4.1.0"
56+
mockitoJupiter = "4.9.0"
57+
truth = "1.1.3"
58+
compileTesting = "0.20"
59+
60+
# build-logic
61+
indra = "3.1.3"
62+
gradleTestLogger = "3.2.0"
63+
gradleErrorprone = "3.0.1"
64+
spotless = "6.21.0"
65+
revapi = "1.7.0"
66+
67+
[libraries]
68+
checkerQual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerQual" }
69+
errorproneCore = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorprone" }
70+
errorproneAnnotations = { group = "com.google.errorprone", name = "error_prone_annotations", version.ref = "errorprone" }
71+
geantyref = { group = "io.leangen.geantyref", name = "geantyref", version.ref = "geantyref" }
72+
jmhCore = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
73+
jmhGeneratorAnnprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
74+
apiguardian = { group = "org.apiguardian", name = "apiguardian-api", version.ref = "apiguardian" }
75+
76+
# integration
77+
guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
78+
79+
# kotlin
80+
coroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
81+
coroutinesJdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "coroutines" }
82+
83+
# discord
84+
javacord = { group = "org.javacord", name = "javacord", version.ref = "javacord" }
85+
jda = { group = "net.dv8tion", name = "JDA", version.ref = "jda" }
86+
87+
# irc
88+
pircbotx = { group = "com.github.pircbotx", name = "pircbotx", version.ref = "pircbotx" }
89+
90+
# minecraft
91+
guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
92+
brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
93+
bukkit = { group = "org.bukkit", name = "bukkit", version.ref = "bukkit" }
94+
commodore = { group = "me.lucko", name = "commodore", version.ref = "commodore" }
95+
jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrainsAnnotations" }
96+
bungeecord = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }
97+
cloudburst = { group = "org.cloudburstmc", name = "cloudburst-server", version.ref = "cloudburst" }
98+
adventureApi = { group = "net.kyori", name = "adventure-api", version.ref = "adventureApi" }
99+
adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventurePlatform" }
100+
adventurePlatformBungeecord = { group = "net.kyori", name = "adventure-platform-bungeecord", version.ref = "adventurePlatform" }
101+
adventureTextSerializerPlain = { group = "net.kyori", name = "adventure-text-serializer-plain", version.ref = "adventureApi" }
102+
paperApi = { group = "com.destroystokyo.paper", name = "paper-api", version.ref = "paperApi" }
103+
paperMojangApi = { group = "com.destroystokyo.paper", name = "paper-mojangapi", version.ref = "paperApi" }
104+
spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "spongeApi7" }
105+
velocityApi = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocityApi" }
106+
fabricMinecraft = { group = "com.mojang", name = "minecraft", version.ref = "fabricMinecraft" }
107+
fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" }
108+
fabricPermissionsApi = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fabricPermissionsApi" }
109+
110+
# testing
111+
jupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiterEngine" }
112+
jupiterParams = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "jupiterEngine" }
113+
mockitoCore = { group = "org.mockito", name = "mockito-core", version.ref = "mockitoCore" }
114+
mockitoKotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlin" }
115+
mockitoJupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockitoJupiter" }
116+
truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
117+
truthJava8 = { group = "com.google.truth.extensions", name = "truth-java8-extension", version.ref = "truth" }
118+
compileTesting = { group = "com.google.testing.compile", name = "compile-testing", version.ref = "compileTesting" }
119+
120+
# build-logic
121+
indraCommon = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
122+
indraPublishingSonatype = { group = "net.kyori", name = "indra-publishing-sonatype", version.ref = "indra" }
123+
gradleTestLogger = { group = "com.adarshr", name = "gradle-test-logger-plugin", version.ref = "gradleTestLogger" }
124+
gradleErrorprone = { group = "net.ltgt.gradle", name = "gradle-errorprone-plugin", version.ref = "gradleErrorprone" }
125+
gradleKotlinJvm = { group = "org.jetbrains.kotlin.jvm", name = "org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" }
126+
gradleDokka = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokka" }
127+
spotless = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
128+
revapi = { group = "com.palantir.gradle.revapi", name = "gradle-revapi", version.ref = "revapi" }
129+
130+
[bundles]
131+
coroutines = ["coroutinesCore", "coroutinesJdk8"]

0 commit comments

Comments
 (0)