Merge pull request #152 from sir-gon/develop

Develop

Author: sir-gon

.github/workflows/gradle.yml renamed to .github/workflows/java-gradle-coverage.yml

@@ -5,7 +5,7 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-name: Java CI with Gradle
+name: Java CI Coverage with Gradle
 
 on:
   push:
@@ -21,24 +21,25 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 20
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '20'
+          java-version: '21'
           distribution: temurin
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup and execute Gradle 'test' task
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: --console=verbose clean checkstyleMain checkstyleTest test
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Runt tests
+        run: ./gradlew --console=verbose test
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v4

.github/workflows/java-gradle.yml

@@ -0,0 +1,49 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI Tests with Gradle
+
+on:
+  push:
+    branches: [ main, develop, feature/* ]
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+jobs:
+  gradle:
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [ '20', '21', '22' ]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: temurin
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Clean
+        run: ./gradlew --console=verbose clean
+
+      - name: Lint
+        run: ./gradlew --console=verbose checkstyleMain checkstyleTest
+
+      - name: Runt tests
+        run: ./gradlew --console=verbose test

.github/workflows/sonarcloud.yml

@@ -16,10 +16,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 20
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin # Alternative distribution options are available
       - name: Cache SonarCloud packages
         uses: actions/cache@v4

Dockerfile

@@ -1,12 +1,12 @@
 ###############################################################################
-FROM gradle:8.4.0-jdk20-alpine AS development
+FROM gradle:8.7.0-jdk21-alpine AS development
 
 RUN apk add --update --no-cache make
 
 WORKDIR /app
 
 ###############################################################################
-FROM node:20.2.0-alpine3.16 AS lint
+FROM node:22.1.0-alpine3.19 AS lint
 
 ENV WORKDIR=/app
 WORKDIR ${WORKDIR}