Merge pull request #14 from PascalHonegger/latest-and-greatest

Latest and greatest versions
PascalHonegger · Nov 18, 2023 · 8c6ea53 · 8c6ea53
2 parents c734f5f + c16ae7d
commit 8c6ea53
Show file tree

Hide file tree

Showing 120 changed files with 3,700 additions and 14,419 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -18,30 +18,12 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 21
           cache: gradle
       - name: Verify
-        run: ./gradlew --no-daemon check koverMergedHtmlReport koverMergedVerify
+        run: ./gradlew --no-daemon check koverHtmlReport koverVerify
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3
         with:
           name: code-coverage-report
           path: build/reports/kover/html/
-
-  qodana-jvm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 19
-          cache: gradle
-      - name: Build
-        run: ./gradlew --no-daemon assemble
-      - name: 'Qodana JVM Scan'
-        uses: JetBrains/[email protected]
-        with:
-          args: '--linter,jetbrains/qodana-jvm'
-          artifact-name: 'qodana-jvm-report'
-          cache-dir: ${{ runner.temp }}/qodana-jvm/caches
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -15,30 +15,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 18
-          cache: npm
-          cache-dependency-path: Frontend/package-lock.json
-      - run: npm ci
-        working-directory: Frontend
-      - run: npm run lint
-        working-directory: Frontend
-
-  qodana-js:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
+          package_json_file: Frontend/package.json
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
-          cache: npm
-          cache-dependency-path: Frontend/package-lock.json
-      - run: npm ci
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: Frontend/pnpm-lock.yaml
+      - run: pnpm i
+        working-directory: Frontend
+      - run: pnpm lint
         working-directory: Frontend
-      - name: 'Qodana JS Scan'
-        uses: JetBrains/[email protected]
-        with:
-          args: '-i,Frontend,--linter,jetbrains/qodana-js'
-          artifact-name: 'qodana-js-report'
-          cache-dir: ${{ runner.temp }}/qodana-js/caches
diff --git a/.github/workflows/gradle-dependency-submission.yml b/.github/workflows/gradle-dependency-submission.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 21
           cache: gradle
 
       - name: Run snapshot action

diff --git a/.github/workflows/operations.yml b/.github/workflows/operations.yml
@@ -18,25 +18,28 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 21
           cache: gradle
+      - uses: pnpm/action-setup@v2
+        with:
+          package_json_file: Frontend/package.json
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
-          cache: npm
-          cache-dependency-path: Frontend/package-lock.json
-      - run: npm ci
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: Frontend/pnpm-lock.yaml
+      - run: pnpm i
         working-directory: Frontend
       - name: Build Frontend
-        run: npm run build
+        run: pnpm build
         working-directory: Frontend
       - name: Build Backend
         run: ./gradlew --no-daemon shadowJar
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -45,7 +48,7 @@ jobs:
           password: ${{ github.token }}
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/pascalhonegger/jasstracker
@@ -55,7 +58,7 @@ jobs:
             type=semver,pattern={{major}}
             type=ref,event=pr
       - name: Build and push container images
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: DockerfileBuiltLocally
           context: .

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/Postgres_Dev.xml b/.idea/runConfigurations/Postgres_Dev.xml
diff --git a/Backend/bootstrap/build.gradle.kts b/Backend/bootstrap/build.gradle.kts
@@ -1,8 +1,8 @@
-@Suppress("DSL_SCOPE_VIOLATION") // see https://youtrack.jetbrains.com/issue/KTIJ-19369
 plugins {
     application
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.shadow)
+    alias(libs.plugins.kover)
 }
 
 application {
@@ -12,6 +12,10 @@ application {
     applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
 }
 
+kotlin {
+    jvmToolchain(20)
+}
+
 dependencies {
     implementation(project(":Backend:data-access"))
     implementation(project(":Backend:domain"))
@@ -31,6 +35,7 @@ dependencies {
     implementation(libs.kotlinx.datetime)
     implementation(libs.logback)
     implementation(libs.kotlin.logging)
+    implementation(libs.slf4j)
     implementation(libs.java.jwt)
 }
 

diff --git a/Backend/bootstrap/src/main/kotlin/dev/honegger/jasstracker/bootstrap/plugins/HTTP.kt b/Backend/bootstrap/src/main/kotlin/dev/honegger/jasstracker/bootstrap/plugins/HTTP.kt
@@ -10,7 +10,7 @@ import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.request.*
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 fun Application.configureHTTP() {
     val log = KotlinLogging.logger {  }

diff --git a/Backend/bootstrap/src/main/resources/application.conf b/Backend/bootstrap/src/main/resources/application.conf
@@ -27,7 +27,7 @@ jwt {
     audience = ${?JWT_AUDIENCE}
     realm = "JassTracker"
     realm = ${?JWT_REALM}
-    expiryTime = 2h
+    expiryTime = 4h
     expiryTime = ${?JWT_EXPIRY_TIME}
 }
 

diff --git a/Backend/data-access/build.gradle.kts b/Backend/data-access/build.gradle.kts
@@ -1,10 +1,14 @@
 import org.jooq.meta.jaxb.ForcedType
 
-@Suppress("DSL_SCOPE_VIOLATION") // see https://youtrack.jetbrains.com/issue/KTIJ-19369
 plugins {
     java
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.jooq)
+    alias(libs.plugins.kover)
+}
+
+kotlin {
+    jvmToolchain(20)
 }
 
 dependencies {

diff --git a/Backend/data-access/src/main/java/dev/honegger/jasstracker/data/database/DefaultCatalog.java b/Backend/data-access/src/main/java/dev/honegger/jasstracker/data/database/DefaultCatalog.java
diff --git a/...end/data-access/src/main/java/dev/honegger/jasstracker/data/database/tables/Contract.java b/...end/data-access/src/main/java/dev/honegger/jasstracker/data/database/tables/Contract.java
diff --git a/Backend/data-access/src/main/java/dev/honegger/jasstracker/data/database/tables/Game.java b/Backend/data-access/src/main/java/dev/honegger/jasstracker/data/database/tables/Game.java