Skip to content

Commit 27f70cf

Browse files
TheMeinerLPTheMeinerLP
authored
Merge pull request #71 from OneLiteFeatherNET/task/dependency-migration
fix(deps): migrate dependencies to version catalog
2 parents 85b4b12 + 48346e5 commit 27f70cf

File tree

6 files changed

+79
-37
lines changed

6 files changed

+79
-37
lines changed

‎adapters/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
}
44

55
dependencies {
6-
testImplementation(platform("org.junit:junit-bom:5.13.4"))
7-
testImplementation("org.junit.jupiter:junit-jupiter")
6+
testImplementation(platform(libs.junitBom))
7+
testImplementation(libs.junitApi)
88
}
99

1010
tasks.test {

‎adapters/database/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ dependencies {
88
implementation(libs.hibernateCore)
99
implementation(libs.mariadbJavaClient)
1010
implementation(libs.hibernateHikariCP)
11+
implementation(libs.jaxbRuntime) // JAXB Runtime for XML binding of hibernate
12+
implementation(libs.postgresql)
13+
implementation(libs.h2) // For testing purposes
1114

12-
implementation("org.glassfish.jaxb:jaxb-runtime:4.0.5")
13-
implementation("org.postgresql:postgresql:42.7.7") //DATABASE
14-
15-
implementation("net.kyori:adventure-api:4.23.0")
15+
// Minecraft Component API
16+
implementation(libs.adventureApi)
1617

1718
compileOnly(project(":api"))
1819

‎api/build.gradle.kts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ dependencies {
77
implementation(libs.hibernateCore)
88
implementation(libs.mariadbJavaClient)
99
implementation(libs.hibernateHikariCP)
10+
implementation(libs.jaxbRuntime) // JAXB Runtime for XML binding of hibernate
11+
implementation(libs.postgresql)
12+
implementation(libs.h2)
13+
// JSON
14+
implementation(libs.gson)
1015

11-
implementation("org.glassfish.jaxb:jaxb-runtime:4.0.5")
12-
implementation("org.postgresql:postgresql:42.7.7") //DATABASE
13-
implementation("com.google.code.gson:gson:2.13.1")
14-
15-
implementation("net.kyori:adventure-api:4.23.0")
16-
testImplementation("com.h2database:h2:2.3.232")
16+
// Minecraft Component API
17+
implementation(libs.adventureApi)
1718
}
1819

1920
tasks {

‎common/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44

55
dependencies {
66

7+
// Caching
78
implementation(libs.caffeine)
89

910
// Database
@@ -14,14 +15,14 @@ dependencies {
1415
implementation(project(":adapters:database"))
1516
implementation(project(":api"))
1617

17-
implementation("org.glassfish.jaxb:jaxb-runtime:4.0.5")
18-
implementation("org.postgresql:postgresql:42.7.7") //DATABASE
18+
implementation(libs.jaxbRuntime) // JAXB Runtime for XML binding of hibernate
19+
implementation(libs.postgresql) // For PostgreSQL database
1920

2021
testImplementation(project(":adapters:database"))
2122
testImplementation(project(":api"))
2223

23-
testImplementation(platform("org.junit:junit-bom:5.13.4"))
24-
testImplementation("org.junit.jupiter:junit-jupiter")
24+
testImplementation(platform(libs.junitBom))
25+
testImplementation(libs.junitApi)
2526

2627
}
2728

‎plugin/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ dependencies {
2828
implementation(libs.hibernateCore)
2929
implementation(libs.hibernateHikariCP)
3030

31-
implementation("org.glassfish.jaxb:jaxb-runtime:4.0.5")
32-
implementation("org.postgresql:postgresql:42.7.7") //DATABASE
31+
implementation(libs.mariadbJavaClient)
32+
implementation(libs.postgresql)
33+
implementation(libs.jaxbRuntime) // JAXB Runtime for XML binding of hibernate
3334

3435
implementation(project(":api"))
3536
implementation(project(":common"))

‎settings.gradle.kts‎

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,76 @@ dependencyResolutionManagement {
1414
versionCatalogs {
1515
create("libs") {
1616

17+
// Non Paper
18+
version("liquibase", "2.2.2")
19+
version("guava", "33.3.1-jre")
20+
version("jaxb-runtime", "4.0.5")
21+
version("caffeine", "3.2.2")
22+
version("h2", "2.3.232")
23+
version("mariadb-java-client", "3.5.4")
24+
version("hibernate-core", "7.0.6.Final")
25+
version("jetbrains-annotations", "26.0.2")
26+
version("postgresql", "42.7.7")
27+
version("gson", "2.13.1")
28+
29+
// Testing
30+
version("junit", "5.13.3")
31+
32+
// Paper Dependencies
1733
version("paper", "1.21.4-R0.1-SNAPSHOT")
34+
version("adventure-api", "4.23.0")
35+
version("cloud", "2.0.0-SNAPSHOT")
36+
version("cloudAnnotations", "2.0.0")
37+
version("adventure-platform-bukkit", "4.4.0")
38+
version("fawe", "2.13.0")
39+
version("worldguard", "7.1.0-SNAPSHOT")
40+
41+
// Gradle Plugins
1842
version("plugin.yml", "0.6.0")
1943
version("run-paper", "2.3.1")
2044
version("shadow", "8.1.1")
21-
version("liquibase", "2.2.2")
22-
version("guava", "33.3.1-jre")
23-
24-
plugin("plugin.yml", "net.minecrell.plugin-yml.paper").versionRef("plugin.yml")
25-
plugin("run.paper", "xyz.jpenilla.run-paper").versionRef("run-paper")
26-
plugin("shadow", "com.github.johnrengelman.shadow").versionRef("shadow")
27-
plugin("liquibase", "org.liquibase.gradle").versionRef("liquibase")
2845

46+
// Paper
2947
library("paper", "io.papermc.paper", "paper-api").versionRef("paper")
3048

3149
//Worldguard
32-
library("worldguard", "com.sk89q.worldguard", "worldguard-bukkit").version("7.1.0-SNAPSHOT")
33-
library("fawe", "com.fastasyncworldedit", "FastAsyncWorldEdit-Bukkit").version("2.13.0")
34-
library("faweCore", "com.fastasyncworldedit", "FastAsyncWorldEdit-Core").version("2.13.0")
35-
library("jetbrainsAnnotations", "org.jetbrains", "annotations").version("26.0.2")
50+
library("worldguard", "com.sk89q.worldguard", "worldguard-bukkit").versionRef("worldguard")
51+
library("fawe", "com.fastasyncworldedit", "FastAsyncWorldEdit-Bukkit").versionRef("fawe")
52+
library("faweCore", "com.fastasyncworldedit", "FastAsyncWorldEdit-Core").versionRef("fawe")
53+
library("jetbrainsAnnotations", "org.jetbrains", "annotations").versionRef("jetbrains-annotations")
3654

3755
// Commands
38-
library("cloudPaper", "org.incendo", "cloud-paper").version("2.0.0-SNAPSHOT")
39-
library("cloudAnnotations", "org.incendo", "cloud-annotations").version("2.0.0")
40-
library("cloudMinecraftExtras", "org.incendo", "cloud-minecraft-extras").version("2.0.0-SNAPSHOT")
41-
library("adventurePlatformBukkit", "net.kyori", "adventure-platform-bukkit").version("4.4.0")
56+
library("cloudPaper", "org.incendo", "cloud-paper").versionRef("cloud")
57+
library("cloudAnnotations", "org.incendo", "cloud-annotations").versionRef("cloudAnnotations")
58+
library("cloudMinecraftExtras", "org.incendo", "cloud-minecraft-extras").versionRef("cloud")
59+
library("adventurePlatformBukkit", "net.kyori", "adventure-platform-bukkit").versionRef("adventure-platform-bukkit")
60+
library("adventureApi", "net.kyori", "adventure-api").versionRef("adventure-api")
4261

43-
library("caffeine", "com.github.ben-manes.caffeine", "caffeine").version("3.2.2")
62+
// Caching
63+
library("caffeine", "com.github.ben-manes.caffeine", "caffeine").versionRef("caffeine")
4464

4565
// Database
46-
library("hibernateCore", "org.hibernate", "hibernate-core").version("7.0.6.Final")
47-
library("mariadbJavaClient","org.mariadb.jdbc", "mariadb-java-client").version("3.5.4")
48-
library("hibernateHikariCP","org.hibernate.orm", "hibernate-hikaricp").version("7.0.6.Final")
66+
library("hibernateCore", "org.hibernate", "hibernate-core").versionRef("hibernate-core")
67+
library("mariadbJavaClient","org.mariadb.jdbc", "mariadb-java-client").versionRef("mariadb-java-client")
68+
library("hibernateHikariCP","org.hibernate.orm", "hibernate-hikaricp").versionRef("hibernate-core")
69+
library("postgresql", "org.postgresql", "postgresql").versionRef("postgresql")
70+
library("h2", "com.h2database", "h2").versionRef("h2")
71+
72+
// XML
73+
library("jaxbRuntime", "org.glassfish.jaxb", "jaxb-runtime").versionRef("jaxb-runtime")
74+
75+
// JSON
76+
library("gson", "com.google.code.gson", "gson").versionRef("gson")
77+
78+
// Testing
79+
library("junitBom", "org.junit", "junit-bom").versionRef("junit")
80+
library("junitApi", "org.junit.jupiter", "junit-jupiter-api").withoutVersion()
81+
82+
// Plugins
83+
plugin("plugin.yml", "net.minecrell.plugin-yml.paper").versionRef("plugin.yml")
84+
plugin("run.paper", "xyz.jpenilla.run-paper").versionRef("run-paper")
85+
plugin("shadow", "com.github.johnrengelman.shadow").versionRef("shadow")
86+
plugin("liquibase", "org.liquibase.gradle").versionRef("liquibase")
4987
}
5088
}
5189
}

0 commit comments

Comments
 (0)