From e5f7f192746db67a712085512765177c9214a6b4 Mon Sep 17 00:00:00 2001
From: Jan Gleytenhoover <krisellp9@gmail.com>
Date: Wed, 25 Sep 2024 15:15:45 +0000
Subject: [PATCH] fix: Fix Sonarqube java version (!17)

Reviewed-on: https://git.kjan.de/jank/LF8/pulls/17
---
 .gitea/workflows/build.yml | 10 +++++++---
 Readme.md                  |  3 +++
 build.gradle.kts           | 12 +++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index f143c2a..4321e8d 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -5,7 +5,6 @@ on:
     branches:
       - main
 
-
 jobs:
   build:
     name: Build and analyze
@@ -15,10 +14,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache SonarQube packages
         uses: actions/cache@v1
         with:
@@ -31,6 +30,11 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
+      - name: Coverage
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+        run: ./gradlew test jacocoTestReport sonar
       - name: Build and analyze
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/Readme.md b/Readme.md
index 1874b0a..8774ce3 100644
--- a/Readme.md
+++ b/Readme.md
@@ -3,6 +3,9 @@
 ![Gitea Release](https://img.shields.io/gitea/v/release/jank/LF8?gitea_url=https%3A%2F%2Fgit.kjan.de&style=plastic)
 ![Gitea Last Commit](https://img.shields.io/gitea/last-commit/jank/LF8?gitea_url=https%3A%2F%2Fgit.kjan.de&style=plastic)
 
+## Code analysis coverage issues and results of linting MAY be found here: 
+https://sonarqube.kjan.de/dashboard?id=LF8&codeScope=overall
+
 # Starter für das LF08 Projekt
 
 ## Requirements
diff --git a/build.gradle.kts b/build.gradle.kts
index 469dd94..12eda3d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,6 +4,15 @@ plugins {
     id("io.spring.dependency-management") version "1.1.6"
     id("checkstyle")
     id("org.sonarqube") version "5.0.0.4638"
+    id("jacoco")
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // Ensure tests are run before generating the report
+    reports {
+        xml.required = true
+        csv.required = true
+    }
 }
 
 sonar {
@@ -67,4 +76,5 @@ dependencies {
 
 tasks.withType<Test> {
     useJUnitPlatform()
-}
+    finalizedBy(tasks.jacocoTestReport) // Run JaCoCo report after tests
+}
\ No newline at end of file