Skip to content

Commit 4957d3d

Browse files
Merge pull request #16 from PascalHonegger/migrate-to-ktor-3
Migrate to ktor 3
2 parents fd5893a + 25d0d7f commit 4957d3d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1982
-1133
lines changed

.github/workflows/frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
package_json_file: Frontend/package.json
2121
- uses: actions/setup-node@v4
2222
with:
23-
node-version: 20
23+
node-version: 22
2424
cache: pnpm
2525
cache-dependency-path: Frontend/pnpm-lock.yaml
2626
- run: pnpm i

.github/workflows/operations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
package_json_file: Frontend/package.json
2626
- uses: actions/setup-node@v4
2727
with:
28-
node-version: 20
28+
node-version: 22
2929
cache: pnpm
3030
cache-dependency-path: Frontend/pnpm-lock.yaml
3131
- run: pnpm i

.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.

.idea/misc.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
@@ -13,7 +13,7 @@ application {
1313
}
1414

1515
kotlin {
16-
jvmToolchain(21)
16+
jvmToolchain(23)
1717
}
1818

1919
dependencies {

Backend/bootstrap/src/main/kotlin/dev/honegger/jasstracker/bootstrap/plugins/DataAccess.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fun Application.initializeDatabase() {
99
url = property("jasstracker.db.url").getString(),
1010
user = property("jasstracker.db.user").getString(),
1111
password = propertyOrNull("jasstracker.db.password")?.getString(),
12-
runTestMigrations = environment.developmentMode
12+
runTestMigrations = developmentMode
1313
)
1414
}
1515
}

Backend/bootstrap/src/main/kotlin/dev/honegger/jasstracker/bootstrap/plugins/HTTP.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import io.ktor.http.*
55
import io.ktor.serialization.kotlinx.json.*
66
import io.ktor.server.application.*
77
import io.ktor.server.plugins.autohead.*
8-
import io.ktor.server.plugins.callloging.*
8+
import io.ktor.server.plugins.calllogging.*
99
import io.ktor.server.plugins.contentnegotiation.*
1010
import io.ktor.server.plugins.cors.routing.*
1111
import io.ktor.server.plugins.statuspages.*
1212
import io.ktor.server.request.*
1313
import io.github.oshai.kotlinlogging.KotlinLogging
1414

1515
fun Application.configureHTTP() {
16-
val log = KotlinLogging.logger { }
17-
if (environment.developmentMode) {
16+
val log = KotlinLogging.logger { }
17+
if (developmentMode) {
1818
install(CORS) {
1919
allowHeader(HttpHeaders.ContentType)
2020
allowHeader(HttpHeaders.Authorization)

Backend/data-access/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
kotlin {
11-
jvmToolchain(21)
11+
jvmToolchain(23)
1212
}
1313

1414
dependencies {

Backend/domain/build.gradle.kts

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

66
kotlin {
7-
jvmToolchain(21)
7+
jvmToolchain(23)
88
}
99

1010
dependencies {

Backend/security/build.gradle.kts

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

66
kotlin {
7-
jvmToolchain(21)
7+
jvmToolchain(23)
88
}
99

1010
dependencies {

0 commit comments

Comments
 (0)