Skip to content

Commit bfa5e0a

Browse files
authored
Migrate to Gradle's Version Catalogs (#285)
* Migrate to Gradle's Version Catalogs https://docs.gradle.org/current/userguide/version_catalogs.html
1 parent 8c8f54c commit bfa5e0a

File tree

2 files changed

+52
-25
lines changed

2 files changed

+52
-25
lines changed

build.gradle.kts

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,63 +19,58 @@ dependencies {
1919
constraints {
2020
implementation("org.slf4j:slf4j-api") {
2121
version {
22-
strictly("[1.7,3)")
23-
prefer("2.0.16")
22+
strictly(libs.versions.slf4jVersionrange.get())
23+
prefer(libs.versions.slf4j.get())
2424
}
2525
}
2626
listOf(
27-
"com.squareup.okio:okio",
28-
"com.squareup.okio:okio-jvm",
27+
libs.bundles.okio,
2928
).forEach {
3029
implementation(it) {
3130
version {
32-
strictly("[3,4)")
33-
prefer("3.9.1")
31+
strictly(libs.versions.okioVersionrange.get())
32+
prefer(libs.versions.okio.get())
3433
}
3534
}
3635
}
3736
api("com.squareup.okhttp3:okhttp") {
3837
version {
39-
strictly("[4,5)")
40-
prefer("4.12.0")
38+
strictly(libs.versions.okhttpVersionrange.get())
39+
prefer(libs.versions.okhttp.get())
4140
}
4241
}
4342
listOf(
44-
"com.kohlschutter.junixsocket:junixsocket-core",
45-
"com.kohlschutter.junixsocket:junixsocket-common"
43+
libs.bundles.junixsocket
4644
).forEach {
4745
implementation(it) {
4846
version {
49-
strictly("[2.4,3)")
50-
prefer("2.10.1")
47+
strictly(libs.versions.junixsocketVersionrange.get())
48+
prefer(libs.versions.junixsocket.get())
5149
}
5250
}
5351
}
5452
listOf(
55-
"org.jetbrains.kotlin:kotlin-stdlib",
56-
"org.jetbrains.kotlin:kotlin-stdlib-common",
57-
"org.jetbrains.kotlin:kotlin-stdlib-jdk7",
58-
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
53+
libs.bundles.kotlin
5954
).forEach {
6055
implementation(it) {
6156
version {
62-
strictly("[1.6,3)")
63-
prefer("2.1.0")
57+
strictly(libs.versions.kotlinVersionrange.get())
58+
prefer(libs.versions.kotlin.get())
6459
}
6560
}
6661
}
6762
}
68-
implementation("org.slf4j:slf4j-api:2.0.16")
69-
testRuntimeOnly("org.slf4j:jul-to-slf4j:2.0.16")
70-
testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14")
63+
implementation(libs.slf4j)
64+
testRuntimeOnly("org.slf4j:jul-to-slf4j:${libs.versions.slf4j.get()}")
65+
testRuntimeOnly("ch.qos.logback:logback-classic:${libs.versions.logbackVersionrange.get()}!!${libs.versions.logback.get()}")
7166

72-
api("com.squareup.okhttp3:okhttp:4.12.0")
73-
implementation("com.squareup.okio:okio:3.9.1")
67+
api(libs.okhttp)
68+
implementation(libs.okio)
7469

75-
implementation("com.kohlschutter.junixsocket:junixsocket-core:2.10.1@pom") {
70+
implementation("com.kohlschutter.junixsocket:junixsocket-core:${libs.versions.junixsocket.get()}@pom") {
7671
isTransitive = true
7772
}
78-
implementation("com.kohlschutter.junixsocket:junixsocket-common:2.10.1")
73+
implementation(libs.junixsocketCommon)
7974

8075
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
8176
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")

gradle/libs.versions.toml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[versions]
2+
junixsocket = "2.10.1"
3+
junixsocketVersionrange = "[2.4,3)"
4+
kotlin = "2.1.0"
5+
kotlinVersionrange = "[1.6,3)"
6+
logback = "1.3.15"
7+
logbackVersionrange = "[1.2,2)"
8+
okhttp = "4.12.0"
9+
okhttpVersionrange = "[4,5)"
10+
okio = "3.9.1"
11+
okioVersionrange = "[3,4)"
12+
slf4j = "2.0.16"
13+
slf4jVersionrange = "[1.7,3)"
14+
15+
[libraries]
16+
junit4 = { module = "junit:junit", version = "4.13.1" }
17+
junixsocketCore = { module = "com.kohlschutter.junixsocket:junixsocket-core", version.ref = "junixsocket" }
18+
junixsocketCommon = { module = "com.kohlschutter.junixsocket:junixsocket-common", version.ref = "junixsocket" }
19+
kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
20+
kotlinCommon = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin" }
21+
kotlinJdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
22+
kotlinJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
23+
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
24+
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
25+
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
26+
okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
27+
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
28+
29+
[bundles]
30+
kotlin = ["kotlin", "kotlinCommon", "kotlinJdk7", "kotlinJdk8"]
31+
junixsocket = ["junixsocketCore", "junixsocketCommon"]
32+
okio = ["okio", "okioJvm"]

0 commit comments

Comments
 (0)