From 4c07f08abc37fc385ff76e6ba863c43be3450f51 Mon Sep 17 00:00:00 2001
From: Manfred Zingl <mz@campudus.com>
Date: Fri, 6 Oct 2023 15:47:17 +0200
Subject: [PATCH] gradle plugin updates and fix coverage report

---
 .github/workflows/branches.yml | 20 +++++++++++++-------
 .github/workflows/main_ci.yml  | 22 ++++++++++++++--------
 build.gradle                   | 10 +++++-----
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml
index 1ac73849..ef07ab23 100644
--- a/.github/workflows/branches.yml
+++ b/.github/workflows/branches.yml
@@ -72,22 +72,22 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: Test Report
+          name: test-report
           path: build/reports/tests/test
 
-      - name: Archive test result (xml)
+      - name: Archive test results (xml)
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: Unit Test Results
+          name: test-results
           path: build/test-results/test/TEST-*.xml
 
       - name: Archive code coverage results
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: Coverage Report
-          path: output/test/code-coverage.html
+          name: coverage-report
+          path: build/reports/scoverage
 
       - name: Test Report
         uses: dorny/test-reporter@v1
@@ -101,6 +101,12 @@ jobs:
           fail-on-error: "true"
           max-annotations: "10"
 
+      - name: Coverage Report
+        uses: 5monkeys/cobertura-action@master
+        with:
+          path: build/reports/scoverage/cobertura.xml
+          minimum_coverage: 80
+
   publish-test-results:
     name: "Publish Unit Tests Results"
     needs: build-and-test
@@ -109,11 +115,11 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         with:
-          files: artifacts/**/*.xml
+          files: artifacts/test-results/**/*.xml
diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
index c463cfb9..54336d85 100644
--- a/.github/workflows/main_ci.yml
+++ b/.github/workflows/main_ci.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        postgres-version: [12, 13, 14, 15, 16]
+        postgres-version: [13, 14, 15, 16]
       max-parallel: 4
       fail-fast: false
 
@@ -76,22 +76,22 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: Test Report
+          name: test-report
           path: build/reports/tests/test
 
-      - name: Archive test result (xml)
+      - name: Archive test results (xml)
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: Unit Test Results
+          name: test-results
           path: build/test-results/test/TEST-*.xml
 
       - name: Archive code coverage results
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: Coverage Report
-          path: output/test/code-coverage.html
+          name: coverage-report
+          path: build/reports/scoverage
 
       - name: Test Report
         uses: dorny/test-reporter@v1
@@ -105,6 +105,12 @@ jobs:
           fail-on-error: "true"
           max-annotations: "10"
 
+      - name: Coverage Report
+        uses: 5monkeys/cobertura-action@master
+        with:
+          path: build/reports/scoverage/cobertura.xml
+          minimum_coverage: 80
+
   publish-test-results:
     name: "Publish Unit Tests Results"
     needs: build-and-test
@@ -113,11 +119,11 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         with:
-          files: artifacts/**/*.xml
+          files: artifacts/test-results/**/*.xml
diff --git a/build.gradle b/build.gradle
index 21e0b569..44cda6ec 100755
--- a/build.gradle
+++ b/build.gradle
@@ -7,15 +7,15 @@ plugins {
   id 'scala'
   id 'application'
 
-  id "com.github.ben-manes.versions" version '0.42.0'
+  id "com.github.ben-manes.versions" version '0.48.0'
 
-  id 'org.scoverage' version '7.0.0'
-  id 'com.github.kt3k.coveralls' version '2.12.0'
+  id 'org.scoverage' version '8.0.3'
+  id 'com.github.kt3k.coveralls' version '2.12.2'
 
   id 'com.github.johnrengelman.shadow' version '7.1.2'
-  id 'org.ajoberstar.grgit' version '4.1.1'
+  id 'org.ajoberstar.grgit' version '5.2.0'
 
-  id 'com.diffplug.spotless' version '6.3.0'
+  id 'com.diffplug.spotless' version '6.22.0'
 
   id 'com.adarshr.test-logger' version '3.2.0'
 }