Skip to content

Commit aa9fe1a

Browse files
chore(backend): upgrade dependencies to latest
1 parent a0bf5ef commit aa9fe1a

File tree

10 files changed

+75
-68
lines changed

10 files changed

+75
-68
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Backend/bootstrap/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
application
33
alias(libs.plugins.kotlin.jvm)
44
alias(libs.plugins.shadow)
5-
alias(libs.plugins.kover)
5+
alias(testLibs.plugins.kover)
66
}
77

88
application {

Backend/data-access/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
java
55
alias(libs.plugins.kotlin.jvm)
66
alias(libs.plugins.jooq)
7-
alias(libs.plugins.kover)
7+
alias(testLibs.plugins.kover)
88
}
99

1010
kotlin {

Backend/domain/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
alias(libs.plugins.kotlin.jvm)
3-
alias(libs.plugins.kover)
3+
alias(testLibs.plugins.kover)
44
}
55

66
kotlin {

Backend/security/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
alias(libs.plugins.kotlin.jvm)
3-
alias(libs.plugins.kover)
3+
alias(testLibs.plugins.kover)
44
}
55

66
kotlin {

Backend/web-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
alias(libs.plugins.kotlin.jvm)
33
alias(libs.plugins.kotlin.serialization)
4-
alias(libs.plugins.kover)
4+
alias(testLibs.plugins.kover)
55
}
66

77
kotlin {

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
plugins {
88
alias(libs.plugins.kotlin.jvm) apply false
99
alias(libs.plugins.kotlin.serialization) apply false
10-
alias(libs.plugins.kover)
11-
alias(libs.plugins.versions)
10+
alias(testLibs.plugins.kover)
11+
alias(testLibs.plugins.versions)
1212
}
1313

1414
allprojects {

gradle/libs.versions.toml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
[versions]
2+
kotlin = "2.1.20"
3+
ktor = "3.1.1"
4+
logback = "1.5.18"
5+
shadow = "8.1.1"
6+
kotlinxDatetime = "0.6.2"
7+
kotlinLogging = "7.0.5"
8+
flyway = "10.20.1"
9+
postgresql = "42.7.5"
10+
jooq = "3.20.2"
11+
jooqPlugin = "10.0"
12+
javaJwt = "4.5.0" # Equal to java-jwt-version from https://github.com/ktorio/ktor/blob/main/gradle/libs.versions.toml
13+
slf4j = "2.0.13"
14+
argon2 = "2.12"
15+
16+
[libraries]
17+
ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" }
18+
ktor-server-host-common = { module = "io.ktor:ktor-server-host-common-jvm", version.ref = "ktor" }
19+
ktor-server-auto-head-response = { module = "io.ktor:ktor-server-auto-head-response-jvm", version.ref = "ktor" }
20+
ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktor" }
21+
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation-jvm", version.ref = "ktor" }
22+
ktor-server-cors = { module = "io.ktor:ktor-server-cors-jvm", version.ref = "ktor" }
23+
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json-jvm", version.ref = "ktor" }
24+
ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor" }
25+
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
26+
ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktor" }
27+
ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktor" }
28+
ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
29+
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime-jvm", version.ref = "kotlinxDatetime" }
30+
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
31+
slf4j = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
32+
kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "kotlinLogging" }
33+
flyway-core = { module = "org.flywaydb:flyway-core", version.ref = "flyway" }
34+
flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version.ref = "flyway" }
35+
postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql" }
36+
jooq = { module = "org.jooq:jooq", version.ref = "jooq" }
37+
java-jwt = { module = "com.auth0:java-jwt", version.ref = "javaJwt" }
38+
argon2-jvm-nolibs = { module = "de.mkammerer:argon2-jvm-nolibs", version.ref = "argon2" }
39+
argon2-jvm = { module = "de.mkammerer:argon2-jvm", version.ref = "argon2" }
40+
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
41+
42+
[plugins]
43+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
44+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
45+
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
46+
jooq = { id = "nu.studer.jooq", version.ref = "jooqPlugin" }

gradle/test-libs.versions.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[versions]
2+
kotlin = "2.1.20"
3+
ktor = "3.1.1"
4+
mockk = "1.13.17"
5+
testcontainers = "1.20.6"
6+
kover = "0.9.1"
7+
versions = "0.52.0"
8+
9+
[libraries]
10+
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }
11+
ktor-server-tests = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" }
12+
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
13+
testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
14+
testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
15+
testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
16+
17+
[plugins]
18+
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
19+
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

settings.gradle.kts

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,71 +6,13 @@ include(":Backend:web-api")
66
include(":Backend:security")
77

88
plugins {
9-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
9+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
1010
}
1111

1212
dependencyResolutionManagement {
1313
versionCatalogs {
14-
val kotlin = "2.1.0-RC"
15-
val mockk = "1.13.13"
16-
val ktor = "3.0.1"
17-
val logback = "1.5.12"
18-
val shadow = "8.1.1"
19-
val kotlinxDatetime = "0.6.1"
20-
val kotlinLogging = "6.0.9"
21-
val flyway = "10.20.1"
22-
val postgresql = "42.7.4"
23-
val jooq = "3.19.8"
24-
val jooqPlugin = "8.2.1"
25-
val kover = "0.8.3"
26-
val testcontainers = "1.20.3"
27-
val javaJwt = "4.4.0" // Equal to java-jwt-version from https://github.com/ktorio/ktor/blob/main/gradle/libs.versions.toml
28-
val slf4j = "2.0.13"
29-
val argon2 = "2.11"
30-
val versions = "0.51.0"
31-
32-
create("libs") {
33-
library("ktor-server-core", "io.ktor", "ktor-server-core-jvm").version(ktor)
34-
library("ktor-server-host-common", "io.ktor", "ktor-server-host-common-jvm").version(ktor)
35-
library("ktor-server-auto-head-response", "io.ktor", "ktor-server-auto-head-response-jvm").version(ktor)
36-
library("ktor-server-call-logging", "io.ktor", "ktor-server-call-logging").version(ktor)
37-
library("ktor-server-content-negotiation", "io.ktor", "ktor-server-content-negotiation-jvm").version(ktor)
38-
library("ktor-server-cors", "io.ktor", "ktor-server-cors-jvm").version(ktor)
39-
library("ktor-serialization-kotlinx-json", "io.ktor", "ktor-serialization-kotlinx-json-jvm").version(ktor)
40-
library("ktor-server-netty", "io.ktor", "ktor-server-netty-jvm").version(ktor)
41-
library("ktor-client-content-negotiation", "io.ktor", "ktor-client-content-negotiation").version(ktor)
42-
library("ktor-server-auth", "io.ktor", "ktor-server-auth").version(ktor)
43-
library("ktor-server-auth-jwt", "io.ktor", "ktor-server-auth-jwt").version(ktor)
44-
library("ktor-server-status-pages", "io.ktor", "ktor-server-status-pages").version(ktor)
45-
library("kotlinx-datetime", "org.jetbrains.kotlinx", "kotlinx-datetime-jvm").version(kotlinxDatetime)
46-
library("logback", "ch.qos.logback", "logback-classic").version(logback)
47-
library("slf4j", "org.slf4j", "slf4j-simple").version(slf4j)
48-
library("kotlin-logging", "io.github.oshai", "kotlin-logging-jvm").version(kotlinLogging)
49-
library("flyway-core", "org.flywaydb", "flyway-core").version(flyway)
50-
library("flyway-postgresql", "org.flywaydb", "flyway-database-postgresql").version(flyway)
51-
library("postgresql", "org.postgresql", "postgresql").version(postgresql)
52-
library("jooq", "org.jooq", "jooq").version(jooq)
53-
library("java-jwt", "com.auth0", "java-jwt").version(javaJwt)
54-
library("argon2-jvm-nolibs", "de.mkammerer", "argon2-jvm-nolibs").version(argon2)
55-
library("argon2-jvm", "de.mkammerer", "argon2-jvm").version(argon2)
56-
library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").version(kotlin)
57-
58-
version("jooq", jooq)
59-
60-
plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version(kotlin)
61-
plugin("kotlin-serialization", "org.jetbrains.kotlin.plugin.serialization").version(kotlin)
62-
plugin("shadow", "com.github.johnrengelman.shadow").version(shadow)
63-
plugin("jooq", "nu.studer.jooq").version(jooqPlugin)
64-
plugin("kover", "org.jetbrains.kotlinx.kover").version(kover)
65-
plugin("versions", "com.github.ben-manes.versions").version(versions)
66-
}
6714
create("testLibs") {
68-
library("kotlin-test", "org.jetbrains.kotlin", "kotlin-test-junit5").version(kotlin)
69-
library("ktor-server-tests", "io.ktor", "ktor-server-test-host").version(ktor)
70-
library("mockk", "io.mockk", "mockk").version(mockk)
71-
library("testcontainers", "org.testcontainers", "testcontainers").version(testcontainers)
72-
library("testcontainers-junit", "org.testcontainers", "junit-jupiter").version(testcontainers)
73-
library("testcontainers-postgresql", "org.testcontainers", "postgresql").version(testcontainers)
15+
from(files("gradle/test-libs.versions.toml"))
7416
}
7517
}
7618
}

0 commit comments

Comments
 (0)