junit5 & gradle update

.github/workflows/gradle.yml

@@ -8,16 +8,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           java-package: jdk+fx
+          distribution: zulu
       - name: Build and test with gradle
         run: ./gradlew check developTest build
       - name: SonarCloud Scan
-        run: ./gradlew sonarqube -Dsonar.projectKey=mediathekview_MServer -Dsonar.organization=mediathekview -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
+        run: ./gradlew sonar -Dsonar.projectKey=mediathekview_MServer -Dsonar.organization=mediathekview -Dsonar.host.url=https://sonarcloud.io
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/release.yml

@@ -9,12 +9,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           java-package: jdk+fx
+          distribution: zulu
       - name: Cache local Maven repository
         uses: actions/cache@v4
         with:
@@ -27,7 +28,7 @@ jobs:
         run: ./gradlew check developTest build
 
       - name: SonarCloud Scan
-        run: ./gradlew sonarqube -Dsonar.projectKey=mediathekview_MServer -Dsonar.organization=mediathekview -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
+        run: ./gradlew sonar -Dsonar.projectKey=mediathekview_MServer -Dsonar.organization=mediathekview -Dsonar.host.url=https://sonarcloud.io
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -43,12 +44,12 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Publish GitHub Release
-        uses: marvinpinto/action-automatic-releases@latest
+        uses: marvinpinto/action-automatic-releases@v1.2.3
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "latest"
           prerelease: false
           files: |
             LICENSE.md
             build/libs/*.jar
-            build/distributions/*
+            build/distributions/*

build.gradle

@@ -3,8 +3,8 @@ import java.nio.file.Files
 plugins {
     id 'application'
     id 'com.github.jk1.dependency-license-report' version "2.0"
-    id "org.sonarqube" version "3.4.0.2513"
-    id 'org.openjfx.javafxplugin' version '0.0.13'
+    id "org.sonarqube" version "7.3.0.8198"
+    id 'org.openjfx.javafxplugin' version '0.1.0'
 }
 
 repositories {
@@ -22,11 +22,10 @@ javafx {
     version = "19"
     modules = [ 'javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.media' ]
 }
-
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
 group = 'de.mediathekview'
-archivesBaseName = "MServer"
+base {
+    archivesName = "MServer"
+}
 version = '3.1.285'
 
 def jarName = 'MServer.jar'
@@ -48,14 +47,13 @@ dependencies {
     implementation 'com.jidesoft:jide-oss:3.6.18'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.15.0'
-
-
-    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:4.11.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
-    testImplementation "org.hamcrest:hamcrest-all:1.3"
+    testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
     testImplementation 'org.assertj:assertj-core:3.23.1'
-
+    testImplementation "org.hamcrest:hamcrest:2.2"
+    testImplementation "org.junit.jupiter:junit-jupiter:5.14.4"
+    testImplementation "org.junit.platform:junit-platform-launcher:1.14.4"
 }
 
 
@@ -97,6 +95,7 @@ configurations {
 }
 
 test {
+    useJUnitPlatform()
 }
 
 task developTest(type: Test) {
@@ -131,7 +130,8 @@ task performanceTest(type: Test) {
 }
 
 tasks.withType(Test) {
-    reports.html.destination = file("${reporting.baseDir}/${name}")
+    reports.html.outputLocation = layout.buildDirectory.dir("reports/${name}")
+    useJUnitPlatform()
 }
 
 ext {
@@ -176,7 +176,7 @@ processResources.dependsOn generateLicenseReport
 
 [distZip, distTar]*.shouldRunAfter compileJava, updateVersion, jar
 distTar.compression = Compression.GZIP
-distTar.extension = 'tar.gz'
+distTar.archiveExtension = 'tar.gz'
 
 jar {
     manifest {
@@ -185,7 +185,7 @@ jar {
                 'Class-Path': configurations.compileClasspath.files.collect { "lib/$it.name" }.join(' ')
         )
     }
-    archiveName = jarName
+    archiveFileName = jarName
 }
 
 distributions {
@@ -216,7 +216,7 @@ distributions {
  * This is how you pass arguments: "./gradlew start -Pargs=arg1,arg2,arg3
  */
 task start(type: JavaExec, dependsOn: classes) {
-    main = mainClass
+    mainClass = mainClass
     classpath = sourceSets.main.runtimeClasspath
 
     if (project.hasProperty('args')) {
@@ -232,7 +232,7 @@ task start(type: JavaExec, dependsOn: classes) {
  * This is how you pass arguments: "./gradlew debug -Pargs=arg1,arg2,arg3
  */
 task debug(type: JavaExec, dependsOn: classes) {
-    main = mainClass
+    mainClass = mainClass
     classpath = sourceSets.main.runtimeClasspath
     debug true
 
@@ -272,3 +272,8 @@ sonarqube {
         property "sonar.projectKey", "mediathekview_MServer"
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-9.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f