Skip to content

Commit fd5893a

Browse files
Merge pull request #15 from PascalHonegger/upgrade-to-latest-deps
Upgrade to latest
2 parents 8c6ea53 + 60398cd commit fd5893a

21 files changed

+2174
-1945
lines changed

.github/workflows/backend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ jobs:
1414
backend:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
18-
- uses: actions/setup-java@v3
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-java@v4
1919
with:
2020
distribution: temurin
2121
java-version: 21
2222
cache: gradle
2323
- name: Verify
2424
run: ./gradlew --no-daemon check koverHtmlReport koverVerify
2525
- name: Archive code coverage results
26-
uses: actions/upload-artifact@v3
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: code-coverage-report
2929
path: build/reports/kover/html/

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
container:
1717
image: texlive/texlive:latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Make LaTeX
2121
working-directory: ./Documentation
2222
run: make doc
2323
- name: Archive built LaTeX documentation
24-
uses: actions/upload-artifact@v3
24+
uses: actions/upload-artifact@v4
2525
with:
2626
name: documentation
2727
path: Documentation/out/*.pdf

.github/workflows/frontend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
frontend:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
18-
- uses: pnpm/action-setup@v2
17+
- uses: actions/checkout@v4
18+
- uses: pnpm/action-setup@v4
1919
with:
2020
package_json_file: Frontend/package.json
21-
- uses: actions/setup-node@v3
21+
- uses: actions/setup-node@v4
2222
with:
2323
node-version: 20
2424
cache: pnpm

.github/workflows/gradle-dependency-submission.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
permissions:
1212
contents: write
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions/setup-java@v3
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-java@v4
1616
with:
1717
distribution: temurin
1818
java-version: 21

.github/workflows/operations.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ jobs:
1414
build-image:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
18-
- uses: actions/setup-java@v3
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-java@v4
1919
with:
2020
distribution: temurin
2121
java-version: 21
2222
cache: gradle
23-
- uses: pnpm/action-setup@v2
23+
- uses: pnpm/action-setup@v4
2424
with:
2525
package_json_file: Frontend/package.json
26-
- uses: actions/setup-node@v3
26+
- uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
2929
cache: pnpm

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ gradle-app.setting
2121
# JDT-specific (Eclipse Java Development Tools)
2222
.classpath
2323

24-
*.DS_Store
24+
.kotlin
25+
26+
*.DS_Store

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

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

1919
dependencies {

Backend/data-access/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ plugins {
88
}
99

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

1414
dependencies {
1515
implementation(project(":Backend:domain"))
1616
implementation(libs.logback)
17-
implementation(libs.flyway)
17+
implementation(libs.flyway.core)
18+
implementation(libs.flyway.postgresql)
1819
implementation(libs.jooq)
1920
implementation(libs.kotlinx.datetime)
2021
implementation(libs.kotlin.reflect)

Backend/domain/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

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

1010
dependencies {
@@ -19,6 +19,8 @@ tasks.withType<Test> {
1919
useJUnitPlatform()
2020
}
2121

22-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
23-
kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
22+
tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class) {
23+
compilerOptions {
24+
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
25+
}
2426
}

0 commit comments

Comments
 (0)