Skip to content

Commit 334d962

Browse files
RothesRothes
committed
Migrate dep version from properties to version catalogs
1 parent a42c995 commit 334d962

File tree

8 files changed

+33
-39
lines changed

8 files changed

+33
-39
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
kotlin("jvm") version libs.versions.kotlin
77
`maven-publish`
88
id("com.gradleup.shadow")
9-
// id("com.xpdustry.kotlin-shadow-relocator") version "3.0.0-rc.1"
109
id("com.github.gmazzo.buildconfig") version "5.5.1"
1110
}
1211

@@ -92,16 +91,13 @@ subprojects {
9291
apply(plugin = "com.github.gmazzo.buildconfig")
9392
buildConfig {
9493
if (project.name == "core") {
95-
val kotlinVersion = rootProject.libs.versions.kotlin
96-
buildConfigField("KOTLIN_VERSION", kotlinVersion)
94+
buildConfigField("DEP_KOTLIN_VERSION", rootProject.libs.versions.kotlin)
9795
} else {
98-
val exposedVersion: String by project
99-
val adventureVersion: String by project
10096
buildConfigField("VERSION_NAME", provider { finalVersionName })
10197
buildConfigField("VERSION_CHANNEL", project.property("versionChannel").toString())
10298
buildConfigField("VERSION_ID", project.property("versionId").toString())
103-
buildConfigField("EXPOSED_VERSION", exposedVersion)
104-
buildConfigField("ADVENTURE_VERSION", adventureVersion)
99+
buildConfigField("DEP_ADVENTURE_VERSION", rootProject.libs.versions.adventure)
100+
buildConfigField("DEP_EXPOSED_VERSION", rootProject.libs.versions.exposed)
105101
}
106102
}
107103

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/EsuPluginBukkit.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ class EsuPluginBukkit(
8787
MavenResolver.loadDependencies(
8888
listOf(
8989
"net.kyori:adventure-platform-bukkit:4.4.1",
90-
"net.kyori:adventure-api:${BuildConfig.ADVENTURE_VERSION}",
91-
"net.kyori:adventure-text-minimessage:${BuildConfig.ADVENTURE_VERSION}",
92-
"net.kyori:adventure-text-serializer-ansi:${BuildConfig.ADVENTURE_VERSION}",
93-
"net.kyori:adventure-text-serializer-gson:${BuildConfig.ADVENTURE_VERSION}",
94-
"net.kyori:adventure-text-serializer-legacy:${BuildConfig.ADVENTURE_VERSION}",
95-
"net.kyori:adventure-text-serializer-plain:${BuildConfig.ADVENTURE_VERSION}",
90+
"net.kyori:adventure-api:${BuildConfig.DEP_ADVENTURE_VERSION}",
91+
"net.kyori:adventure-text-minimessage:${BuildConfig.DEP_ADVENTURE_VERSION}",
92+
"net.kyori:adventure-text-serializer-ansi:${BuildConfig.DEP_ADVENTURE_VERSION}",
93+
"net.kyori:adventure-text-serializer-gson:${BuildConfig.DEP_ADVENTURE_VERSION}",
94+
"net.kyori:adventure-text-serializer-legacy:${BuildConfig.DEP_ADVENTURE_VERSION}",
95+
"net.kyori:adventure-text-serializer-plain:${BuildConfig.DEP_ADVENTURE_VERSION}",
9696
)
9797
) { file, artifact ->
9898
if (artifact.groupId == "net.kyori")
@@ -109,10 +109,10 @@ class EsuPluginBukkit(
109109
}
110110
MavenResolver.loadDependencies(
111111
listOf(
112-
"org.jetbrains.exposed:exposed-core:${BuildConfig.EXPOSED_VERSION}",
113-
"org.jetbrains.exposed:exposed-jdbc:${BuildConfig.EXPOSED_VERSION}",
114-
"org.jetbrains.exposed:exposed-kotlin-datetime:${BuildConfig.EXPOSED_VERSION}",
115-
"org.jetbrains.exposed:exposed-json:${BuildConfig.EXPOSED_VERSION}",
112+
"org.jetbrains.exposed:exposed-core:${BuildConfig.DEP_EXPOSED_VERSION}",
113+
"org.jetbrains.exposed:exposed-jdbc:${BuildConfig.DEP_EXPOSED_VERSION}",
114+
"org.jetbrains.exposed:exposed-kotlin-datetime:${BuildConfig.DEP_EXPOSED_VERSION}",
115+
"org.jetbrains.exposed:exposed-json:${BuildConfig.DEP_EXPOSED_VERSION}",
116116

117117
"com.zaxxer:HikariCP:6.3.0",
118118
"org.incendo:cloud-core:2.0.0",
@@ -185,7 +185,7 @@ class EsuPluginBukkit(
185185

186186
fun onEnable() {
187187
adventure // Init adventure
188-
EsuConfig // Load global config, in case of. MavenResolver should init it tho.
188+
EsuConfig // Load global config
189189
BukkitEsuLocale // Load global locale
190190
StorageManager // Load database
191191
ColorSchemes // Load color schemes

‎core/build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ repositories {
55
maven("https://jitpack.io")
66
}
77

8-
val exposedVersion: String by project
9-
108
dependencies {
119
api(kotlin("reflect"))
1210

1311
compileOnlyApi(project(":core:dep-core", configuration = "shadow"))
1412
api(project(":core:dep-impl-core", configuration = "shadow"))
1513

14+
val exposedVersion = rootProject.libs.versions.exposed.get()
1615
compileOnlyApi("org.jetbrains.exposed:exposed-core:$exposedVersion")
1716
// api("org.jetbrains.exposed:exposed-dao:$exposedVersion")
1817
compileOnlyApi("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
@@ -27,8 +26,8 @@ dependencies {
2726
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
2827
}
2928

30-
val adventureVersion: String by project
31-
compileOnly("net.kyori:adventure-text-minimessage:${adventureVersion}")
29+
val adventureVersion = rootProject.libs.versions.adventure.get()
30+
compileOnly("net.kyori:adventure-text-minimessage:$adventureVersion")
3231
compileOnly("net.kyori:adventure-text-serializer-gson:$adventureVersion") {
3332
exclude("com.google.code.gson")
3433
}

‎core/dep-core/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repositories {
44
}
55

66
dependencies {
7-
val adventureVersion: String by project
7+
val adventureVersion = rootProject.libs.versions.adventure.get()
88
implementation("net.kyori:adventure-api:$adventureVersion")
99
implementation("net.kyori:adventure-text-minimessage:$adventureVersion")
1010
implementation("net.kyori:adventure-text-serializer-ansi:$adventureVersion")

‎core/src/main/kotlin/io/github/rothes/esu/core/util/artifact/MavenResolver.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ object MavenResolver {
7979
}
8080

8181
fun loadKotlin() {
82-
loadDependency("org.jetbrains.kotlin:kotlin-reflect:${BuildConfig.KOTLIN_VERSION}")
82+
loadDependency("org.jetbrains.kotlin:kotlin-reflect:${BuildConfig.DEP_KOTLIN_VERSION}")
8383
}
8484

8585
fun loadUrl(url: URL) {

‎gradle.properties‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@ versionChannel = stable
33
versionId = 12
44
targetMinecraftVersion = 1.21.9
55

6-
exposedVersion = 1.0.0-beta-4
7-
adventureVersion = 4.24.0
8-
96
kotlin.daemon.jvmargs=-Xmx2G

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
[versions]
2-
kotlin = "2.2.20"
2+
kotlin = "2.2.20"
3+
adventure = "4.24.0"
4+
exposed = "1.0.0-beta-4"

‎velocity/src/main/kotlin/io/github/rothes/esu/velocity/EsuPluginVelocity.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ class EsuPluginVelocity(
6969

7070
MavenResolver.loadDependencies(
7171
listOf(
72-
"org.jetbrains.exposed:exposed-core:${BuildConfig.EXPOSED_VERSION}",
73-
"org.jetbrains.exposed:exposed-jdbc:${BuildConfig.EXPOSED_VERSION}",
74-
"org.jetbrains.exposed:exposed-kotlin-datetime:${BuildConfig.EXPOSED_VERSION}",
75-
"org.jetbrains.exposed:exposed-json:${BuildConfig.EXPOSED_VERSION}",
72+
"org.jetbrains.exposed:exposed-core:${BuildConfig.DEP_EXPOSED_VERSION}",
73+
"org.jetbrains.exposed:exposed-jdbc:${BuildConfig.DEP_EXPOSED_VERSION}",
74+
"org.jetbrains.exposed:exposed-kotlin-datetime:${BuildConfig.DEP_EXPOSED_VERSION}",
75+
"org.jetbrains.exposed:exposed-json:${BuildConfig.DEP_EXPOSED_VERSION}",
7676

7777
"com.zaxxer:HikariCP:6.3.0",
7878
"org.incendo:cloud-core:2.0.0",
@@ -91,12 +91,12 @@ class EsuPluginVelocity(
9191
val relocator = PackageRelocator("net/kyori/" to "io/github/rothes/esu/lib/net/kyori/")
9292
MavenResolver.loadDependencies(
9393
listOf(
94-
"net.kyori:adventure-api:${BuildConfig.ADVENTURE_VERSION}",
95-
"net.kyori:adventure-text-minimessage:${BuildConfig.ADVENTURE_VERSION}",
96-
"net.kyori:adventure-text-serializer-ansi:${BuildConfig.ADVENTURE_VERSION}",
97-
"net.kyori:adventure-text-serializer-gson:${BuildConfig.ADVENTURE_VERSION}",
98-
"net.kyori:adventure-text-serializer-legacy:${BuildConfig.ADVENTURE_VERSION}",
99-
"net.kyori:adventure-text-serializer-plain:${BuildConfig.ADVENTURE_VERSION}",
94+
"net.kyori:adventure-api:${BuildConfig.DEP_ADVENTURE_VERSION}",
95+
"net.kyori:adventure-text-minimessage:${BuildConfig.DEP_ADVENTURE_VERSION}",
96+
"net.kyori:adventure-text-serializer-ansi:${BuildConfig.DEP_ADVENTURE_VERSION}",
97+
"net.kyori:adventure-text-serializer-gson:${BuildConfig.DEP_ADVENTURE_VERSION}",
98+
"net.kyori:adventure-text-serializer-legacy:${BuildConfig.DEP_ADVENTURE_VERSION}",
99+
"net.kyori:adventure-text-serializer-plain:${BuildConfig.DEP_ADVENTURE_VERSION}",
100100
)
101101
) { file, artifact ->
102102
if (artifact.groupId == "net.kyori")
@@ -128,7 +128,7 @@ class EsuPluginVelocity(
128128
}
129129

130130
fun onProxyInitialization() {
131-
EsuConfig // Load global config, in case of. MavenResolver should init it tho.
131+
EsuConfig // Load global config
132132
VelocityEsuLocale // Load global locale
133133
StorageManager // Load database
134134
ColorSchemes // Load color schemes

0 commit comments

Comments
 (0)