Skip to content

Commit e5e7c12

Browse files
committed
Version Catalogs initial POC
todo - needs release build of multi-version-catalog - need to go through the patches and migrate all the dependencies & versions
1 parent ed753d3 commit e5e7c12

File tree

3 files changed

+72
-0
lines changed

3 files changed

+72
-0
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
3+
Date: Sat, 25 Nov 2023 16:01:27 -0800
4+
Subject: [PATCH] Version Catalog POC
5+
6+
7+
diff --git a/build.gradle.kts b/build.gradle.kts
8+
index e827ee211e3c65dc68ac5867fd8476639df63645..76153b68ef7a6cfbea5350229362d52122bf8c35 100644
9+
--- a/build.gradle.kts
10+
+++ b/build.gradle.kts
11+
@@ -11,7 +11,7 @@ java {
12+
13+
val annotationsVersion = "24.0.1"
14+
val bungeeCordChatVersion = "1.20-R0.1"
15+
-val adventureVersion = "4.14.0"
16+
+val adventureVersion = libs.versions.adventure.get()
17+
val slf4jVersion = "1.8.0-beta4"
18+
val log4jVersion = "2.17.1"
19+
val apiAndDocs: Configuration by configurations.creating {
20+
@@ -32,7 +32,7 @@ dependencies {
21+
api("com.google.code.gson:gson:2.10.1")
22+
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
23+
api("org.yaml:snakeyaml:2.2")
24+
- api("org.joml:joml:1.10.5")
25+
+ api(libs.joml)
26+
// Paper start
27+
api("com.googlecode.json-simple:json-simple:1.1.1") {
28+
isTransitive = false // includes junit
29+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
30+
new file mode 100644
31+
index 0000000000000000000000000000000000000000..791bbc8d0d4b277a637c665b20a507e1d44f75f8
32+
--- /dev/null
33+
+++ b/gradle/libs.versions.toml
34+
@@ -0,0 +1,5 @@
35+
+[versions]
36+
+adventure = "4.14.0"
37+
+
38+
+[libraries]
39+
+joml = "org.joml:joml:1.10.5"
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
3+
Date: Sat, 25 Nov 2023 16:01:16 -0800
4+
Subject: [PATCH] Version Catalog POC
5+
6+
7+
diff --git a/build.gradle.kts b/build.gradle.kts
8+
index 79beac737c17412913983614bd478d33e3c6ed58..0dec0afa97f9d4a8d0adf2c33589d137dd6a3ebb 100644
9+
--- a/build.gradle.kts
10+
+++ b/build.gradle.kts
11+
@@ -18,7 +18,7 @@ dependencies {
12+
// Paper start
13+
implementation("org.jline:jline-terminal-jansi:3.21.0")
14+
implementation("net.minecrell:terminalconsoleappender:1.3.0")
15+
- implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
16+
+ implementation(libs.adventure.text.serializer.ansi)
17+
implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
18+
/*
19+
Required to add the missing Log4j2Plugins.dat file from log4j-core
20+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
21+
new file mode 100644
22+
index 0000000000000000000000000000000000000000..3de7b4066dfd57f8074fecf7038393a2c7398059
23+
--- /dev/null
24+
+++ b/gradle/libs.versions.toml
25+
@@ -0,0 +1,2 @@
26+
+[libraries]
27+
+adventure-text-serializer-ansi = { module = "net.kyori:adventure-text-serializer-ansi", version.ref = "adventure" }

settings.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ pluginManagement {
99

1010
plugins {
1111
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
12+
id("io.papermc.multi-version-catalog") version "1.0.0-SNAPSHOT"
1213
}
1314

1415
if (!file(".git").exists()) {
@@ -39,6 +40,11 @@ for (name in listOf("Paper-API", "Paper-Server", "Paper-MojangAPI")) {
3940
findProject(":$projName")!!.projectDir = file(name)
4041
}
4142

43+
multiVersionCatalog.fromFiles(
44+
"libs",
45+
rootProject.children.map { it.projectDir.resolve("gradle/libs.versions.toml") }
46+
)
47+
4248
mapOf("test-plugin.settings.gradle.kts" to """
4349
// Uncomment to enable the test plugin module
4450
// include(":test-plugin")

0 commit comments

Comments
 (0)