Skip to content

Commit 1512429

Browse files
committed
Store versions in version catalog
1 parent 21ffd33 commit 1512429

File tree

2 files changed

+59
-17
lines changed

2 files changed

+59
-17
lines changed

build.gradle.kts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ plugins {
1111
java
1212
`java-library`
1313
`maven-publish`
14-
kotlin("jvm") version "1.9.21"
15-
kotlin("plugin.serialization") version "1.9.21"
16-
id("org.jetbrains.dokka") version "1.9.10"
17-
id("org.ajoberstar.grgit") version "5.2.0"
18-
id("com.vanniktech.maven.publish.base") version "0.25.3"
14+
kotlin("jvm") version libs.versions.kotlin
15+
kotlin("plugin.serialization") version libs.versions.kotlin
16+
id("org.jetbrains.dokka") version libs.versions.dokka
17+
id("org.ajoberstar.grgit") version libs.versions.grgit
18+
id("com.vanniktech.maven.publish.base") version libs.versions.maven.publish
1919
}
2020

2121
val (gitVersion, release) = versionFromGit()
@@ -42,21 +42,21 @@ repositories {
4242
dependencies {
4343
// package libraries
4444
api(kotlin("stdlib"))
45-
api("dev.arbjerg.lavalink:protocol:47201924be7d5a459753fc85f00ca30e49ba3cd1-SNAPSHOT")
46-
api("com.squareup.okhttp3:okhttp:4.10.0")
47-
api("io.projectreactor:reactor-core:3.5.6")
48-
api("io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.2")
49-
api("org.slf4j:slf4j-api:2.0.7")
45+
api(libs.kotlin)
46+
api(libs.lavalink.protocol)
47+
api(libs.okhttp)
48+
api(libs.bundles.reactor)
49+
api(libs.logger.api)
5050

5151
// Discord library support
52-
compileOnly("net.dv8tion:JDA:5.0.0-beta.11")
53-
compileOnly("com.discord4j:discord4j-core:3.2.3")
52+
compileOnly(libs.jda)
53+
compileOnly(libs.d4j)
5454

5555
testImplementation(kotlin("test"))
56-
testImplementation("net.dv8tion:JDA:5.0.0-beta.11")
57-
testImplementation("com.discord4j:discord4j-core:3.2.3")
58-
testImplementation("org.slf4j:slf4j-simple:2.0.7")
59-
testImplementation("com.github.topi314.lavasearch:lavasearch-protocol:1.0.0-beta.2")
56+
testImplementation(libs.jda)
57+
testImplementation(libs.d4j)
58+
testImplementation(libs.logger.impl)
59+
testImplementation(libs.lavasearch)
6060
}
6161

6262
val sourcesForRelease = task<Copy>("sourcesForRelease") {

settings.gradle.kts

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1-
21
rootProject.name = "lavalink-client"
32

3+
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
4+
5+
dependencyResolutionManagement {
6+
versionCatalogs {
7+
create("libs") {
8+
versionRefs()
9+
common()
10+
discordLibs()
11+
testLibs()
12+
}
13+
}
14+
}
15+
16+
fun VersionCatalogBuilder.versionRefs() {
17+
version("kotlin", "1.9.21")
18+
version("dokka", "1.9.10")
19+
version("grgit", "5.2.0")
20+
version("maven-publish", "0.25.3")
21+
22+
version("logger", "2.0.7")
23+
}
24+
25+
fun VersionCatalogBuilder.common() {
26+
library("kotlin", "org.jetbrains.kotlin", "kotlin-stdlib").versionRef("kotlin")
27+
library("lavalink-protocol", "dev.arbjerg.lavalink", "protocol").version("47201924be7d5a459753fc85f00ca30e49ba3cd1-SNAPSHOT")
28+
library("okhttp", "com.squareup.okhttp3", "okhttp").version("4.10.0")
29+
library("reactor-core", "io.projectreactor", "reactor-core").version("3.5.6")
30+
library("reactor-kotlin", "io.projectreactor.kotlin", "reactor-kotlin-extensions").version("1.2.2")
31+
32+
bundle("reactor", listOf("reactor-core", "reactor-kotlin"))
33+
34+
library("logger-api", "org.slf4j", "slf4j-api").versionRef("logger")
35+
}
36+
37+
fun VersionCatalogBuilder.discordLibs() {
38+
library("jda", "net.dv8tion", "JDA").version("5.0.0-beta.11")
39+
library("d4j", "com.discord4j", "discord4j-core").version("3.2.3")
40+
}
41+
42+
fun VersionCatalogBuilder.testLibs() {
43+
library("logger-impl", "org.slf4j", "slf4j-simple").versionRef("logger")
44+
library("lavasearch", "com.github.topi314.lavasearch", "lavasearch-protocol").version("1.0.0-beta.2")
45+
}

0 commit comments

Comments
 (0)