Merge pull request #608 from ie3-institute/df/#607-java-21

Updated to Java 21 and Gradle 9.1.0

Author: sebastian-peter

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -71,8 +71,7 @@ jobs:
 
       - name: Run Tests
         run: |
-          ./gradlew pmdMain pmdTest spotbugsMain spotbugsTest test jacocoTestReport jacocoTestCoverageVerification \
-          reportScoverage checkScoverage
+          ./gradlew pmdMain pmdTest spotbugsMain spotbugsTest test jacocoTestReport jacocoTestCoverageVerification reportScoverage
 
       - name: Build Scala-Docs
         run: ./gradlew scaladoc

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Bumped scala to 3.7.0 [#561](https://github.com/ie3-institute/PowerSystemUtils/pull/561)
+- Updated to Java 21 and Gradle 9.1.0 [#607](https://github.com/ie3-institute/PowerSystemUtils/issue/607)
 
 ### Fixed
 - Fixed missing scala sources in releases [#549](https://github.com/ie3-institute/PowerSystemUtils/issues/549)

build.gradle

@@ -15,7 +15,7 @@ plugins {
 }
 
 ext {
-	javaVersion = JavaVersion.VERSION_17
+	javaVersion = JavaVersion.VERSION_21
 	scalaVersion = '3'
 	scalaBinaryVersion = '3.7.3'
 	scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
@@ -45,6 +45,11 @@ repositories {
 	mavenCentral()
 }
 
+
+pmd {
+	toolVersion = '7.8.0' // PMD >7.x supports Java 21
+}
+
 dependencies {
 	// logging
 	implementation 'org.slf4j:slf4j-api:2.0.17'  // slf4j wrapper
@@ -74,6 +79,9 @@ dependencies {
 
 	// testing
 	testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
+	testImplementation 'org.apache.groovy:groovy:4.0.26'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.0'
 
 	/* --- Scala libs --- */
 	// CORE Scala //
@@ -89,3 +97,7 @@ dependencies {
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
 }
+
+tasks.test {
+	useJUnitPlatform() // Gradle using JUnit Platform
+}

gradle/scripts/scoverage.gradle

@@ -4,6 +4,7 @@
 
 scoverage {
 	scoverageVersion = "2.3.0"
+	scoverageScalaVersion //= scalaBinaryVersion
 	coverageOutputHTML = false
 	coverageOutputXML = true
 	coverageOutputCobertura = false

gradle/scripts/spotless.gradle

@@ -10,7 +10,7 @@ spotless {
 	//sets a license header, removes unused imports and formats conforming to the google java format
 	java {
 		removeUnusedImports() // removes any unused imports
-		googleJavaFormat('1.13.0')
+		googleJavaFormat('1.28.0')
 		licenseHeader ie3LicHead
 	}
 
@@ -21,7 +21,7 @@ spotless {
 		// the Groovy Eclipse formatter extends the Java Eclipse formatter,
 		// so it formats Java files by default (unless `excludeJava` is used).
 		greclipse()
-		indentWithSpaces 2
+		leadingTabsToSpaces(2)
 	}
 
 	groovyGradle {
@@ -40,13 +40,13 @@ spotless {
 	format 'misc', {
 		target '**/*.gradle', '**/.gitignore', 'configs/**'
 		trimTrailingWhitespace()
-		indentWithTabs()
+		leadingSpacesToTabs()
 		endWithNewline()
 	}
 
 	format 'markdown', {
 		target '**/*.md'
-		indentWithSpaces(2)
+		leadingTabsToSpaces(2)
 		endWithNewline()
 	}
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -26,7 +26,7 @@ abstract class Interval<T extends Comparable<? super T> & Serializable> implemen
    *
    * @param u The desired upper boundary.
    */
-  void setUpperBound(T u) {
+  protected final void setUpperBound(T u) {
     if (u == null) throw new NullPointerException("Bound must not be null");
     if (lower == null) {
       lower = u;
@@ -44,7 +44,7 @@ void setUpperBound(T u) {
    *
    * @param l The desired lower boundary.
    */
-  void setLowerBound(T l) {
+  protected final void setLowerBound(T l) {
     if (l == null) throw new NullPointerException("Bound must not be null");
     if (lower == null) {
       lower = l;
@@ -69,7 +69,7 @@ void setLowerBound(T l) {
    *
    * @return The lower boundary
    */
-  public T getLower() {
+  protected final T getLower() {
     return lower;
   }
 
@@ -78,7 +78,7 @@ public T getLower() {
    *
    * @return The upper boundary.
    */
-  public T getUpper() {
+  protected final T getUpper() {
     return upper;
   }