Skip to content

Commit 5503dc5

Browse files
siujamosiujamo
committed
refactor: changed to version catalogue and upgraded dependencies
1 parent e216ca8 commit 5503dc5

File tree

14 files changed

+128
-159
lines changed

14 files changed

+128
-159
lines changed

‎devkit-core/build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,10 @@ dependencies {
5656
val logbackVersion: String by project
5757
val junitVersion: String by project
5858

59-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
60-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
59+
compileOnly(libs.slf4j)
60+
implementation(libs.logback)
6161

62-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
63-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
62+
testImplementation(libs.junit)
6463
}
6564

6665
tasks.test {

‎devkit-utils/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,10 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
59-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
60-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
61-
implementation(project(":devkit-core"))
62-
63-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
64-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
api(project(":devkit-core"))
58+
testImplementation(libs.junit)
6559
}
6660

6761
tasks.test {

‎gradle.properties‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,4 @@ artefactVersion=2.1.0
1919
projectUrl=https://onixbyte.com/JDevKit
2020
projectGithubUrl=https://github.com/OnixByte/JDevKit
2121
licenseName=The Apache License, Version 2.0
22-
licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt
23-
24-
jacksonVersion=2.18.2
25-
javaJwtVersion=4.4.0
26-
junitVersion=5.11.4
27-
logbackVersion=1.5.16
28-
slf4jVersion=2.0.16
29-
springVersion=6.2.2
30-
springBootVersion=3.4.2
22+
licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt

‎gradle/libs.versions.toml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[versions]
2+
slf4j = "2.0.17"
3+
logback = "1.5.18"
4+
jackson = "2.18.3"
5+
jwt = "4.5.0"
6+
spring = "6.2.6"
7+
springBoot = "3.4.4"
8+
junit = "5.12.2"
9+
10+
[libraries]
11+
slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
12+
logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
13+
jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson" }
14+
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
15+
jwt = { group = "com.auth0", name = "java-jwt", version.ref = "jwt"}
16+
spring-boot-autoconfigure = { group = "org.springframework.boot", name = "spring-boot-autoconfigure", version.ref = "springBoot" }
17+
spring-boot-starter-logging = { group = "org.springframework.boot", name = "spring-boot-starter-logging", version.ref = "springBoot" }
18+
spring-boot-configuration-processor = { group = "org.springframework.boot", name = "spring-boot-configuration-processor", version.ref = "springBoot" }
19+
spring-boot-starter-redis = { group = "org.springframework.boot", name = "spring-boot-starter-data-redis", version.ref = "springBoot" }
20+
spring-boot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "springBoot" }
21+
junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }

‎guid/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,10 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
59-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
60-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
61-
implementation(project(":devkit-core"))
62-
63-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
64-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
api(project(":devkit-core"))
58+
testImplementation(libs.junit)
6559
}
6660

6761
tasks.test {

‎key-pair-loader/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,10 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
59-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
60-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
61-
implementation(project(":devkit-core"))
62-
63-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
64-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
api(project(":devkit-core"))
58+
testImplementation(libs.junit)
6559
}
6660

6761
tasks.test {

‎map-util-unsafe/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,10 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
59-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
60-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
61-
implementation(project(":devkit-core"))
62-
63-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
64-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
api(project(":devkit-core"))
58+
testImplementation(libs.junit)
6559
}
6660

6761
tasks.test {

‎num4j/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,10 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
59-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
60-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
61-
implementation(project(":devkit-core"))
62-
63-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
64-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
api(project(":devkit-core"))
58+
testImplementation(libs.junit)
6559
}
6660

6761
tasks.test {

‎property-guard-spring-boot-starter/build.gradle.kts‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,16 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
val springBootVersion: String by project
59-
60-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
61-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
62-
implementation(project(":devkit-core"))
63-
implementation(project(":devkit-utils"))
64-
implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
65-
implementation("org.springframework.boot:spring-boot-starter-logging:$springBootVersion")
66-
implementation("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
67-
68-
testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
69-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
70-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
api(project(":devkit-core"))
58+
api(project(":devkit-utils"))
59+
implementation(libs.spring.boot.autoconfigure)
60+
implementation(libs.spring.boot.starter.logging)
61+
implementation(libs.spring.boot.configuration.processor)
62+
63+
testImplementation(libs.junit)
64+
testImplementation(libs.spring.boot.starter.test)
7165
}
7266

7367
tasks.test {

‎simple-jwt-authzero/build.gradle.kts‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,17 @@ tasks.withType<Jar> {
5252
}
5353

5454
dependencies {
55-
val slf4jVersion: String by project
56-
val logbackVersion: String by project
57-
val junitVersion: String by project
58-
val jacksonVersion: String by project
59-
val javaJwtVersion: String by project
60-
61-
compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
62-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
63-
64-
implementation(project(":devkit-utils"))
65-
implementation(project(":guid"))
66-
implementation(project(":key-pair-loader"))
67-
implementation(project(":simple-jwt-facade"))
68-
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
69-
implementation("com.auth0:java-jwt:$javaJwtVersion")
70-
71-
testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
72-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
compileOnly(libs.slf4j)
56+
implementation(libs.logback)
57+
58+
api(project(":devkit-utils"))
59+
api(project(":guid"))
60+
api(project(":key-pair-loader"))
61+
api(project(":simple-jwt-facade"))
62+
api(libs.jackson.databind)
63+
api(libs.jwt)
64+
65+
testImplementation(libs.junit)
7366
}
7467

7568
tasks.test {

0 commit comments

Comments
 (0)