Merge pull request #199 from ie3-institute/jh/#194_switch_to_java17

Switch to java 17

Author: sebastian-peter

.scalafmt.conf

@@ -0,0 +1 @@
+runner.dialect = scala3

Jenkinsfile

@@ -10,18 +10,17 @@ plugins {
 	id 'jacoco' // java code coverage plugin
 	id "org.sonarqube" version "3.3" // sonarqube
 	id "com.github.maiflai.scalatest" version "0.32" // run scalatest without specific spec task
-	id 'org.scoverage' version '7.0.0' // Code coverage plugin for scala
 }
 
 ext {
-	javaVersion = JavaVersion.VERSION_1_8
-	scalaVersion = '2.13'
-	scalaBinaryVersion = '2.13.7'
+	javaVersion = JavaVersion.VERSION_17
+	scalaVersion = '3'
+	scalaBinaryVersion = '3.1.0'
 	scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
 }
 
 group = 'com.github.ie3-institute'
-version = '1.6'
+version = '2.0-SNAPSHOT'
 description = 'PowerSystemUtils'
 sourceCompatibility = javaVersion
 targetCompatibility = javaVersion
@@ -32,7 +31,6 @@ apply from: scriptsLocation + 'spotless.gradle'
 apply from: scriptsLocation + 'checkJavaVersion.gradle'
 apply from: scriptsLocation + 'jacoco.gradle' // jacoco java code coverage
 apply from: scriptsLocation + 'mavenCentralPublish.gradle'
-apply from: scriptsLocation + 'scoverage.gradle'
 apply from: scriptsLocation + 'sonarqube.gradle'
 
 repositories {
@@ -68,14 +66,16 @@ dependencies {
 	implementation 'org.apache.commons:commons-compress:1.21' // I/O functionalities
 
 	// testing
-	testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
+	testImplementation 'org.spockframework:spock-core:2.1-M2-groovy-3.0'
+
 
 	/* --- Scala libs --- */
 	// CORE Scala //
-	implementation "org.scala-lang:scala-library:${scalaBinaryVersion}"
+	implementation "org.scala-lang:scala3-library_3:${scalaBinaryVersion}"
+	implementation 'org.scala-lang.modules:scala-parallel-collections_3:1.0.4'
 
 	// TEST Scala //
-	implementation "org.scalatest:scalatest_${scalaVersion}:3.2.10"
+	implementation "org.scalatest:scalatest_$scalaVersion:3.2.10"
 	testRuntimeClasspath 'com.vladsch.flexmark:flexmark-all:0.62.2'
 }
 

build.gradle

@@ -9,11 +9,20 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4096m
+
+# Workaround to make spotless work with java 17 -
+# see https://github.com/diffplug/spotless/tree/main/plugin-gradle#google-java-format and
+# https://github.com/ie3-institute/PowerSystemUtils/issues/200 for details
+org.gradle.jvmargs=-Xmx4096m \
+  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-com.github.maiflai.gradle-scalatest.mode = append
+com.github.maiflai.gradle-scalatest.mode = append

gradle.properties

@@ -48,6 +48,3 @@ project.tasks["sonarqube"].dependsOn "check"
 
 project.tasks["sonarqube"].dependsOn "jacocoTestReport"
 project.tasks["sonarqube"].dependsOn "jacocoTestCoverageVerification"
-
-project.tasks["sonarqube"].dependsOn "reportScoverage"
-project.tasks["sonarqube"].dependsOn "checkScoverage"

gradle/scripts/scoverage.gradle

@@ -10,17 +10,18 @@ spotless {
 	//sets a license header, removes unused imports and formats conforming to the google java format
 	java {
 		removeUnusedImports() // removes any unused imports
-		googleJavaFormat()
+		googleJavaFormat('1.13.0')
 		licenseHeader ie3LicHead
 	}
 
 	/* cf. https://github.com/diffplug/spotless/tree/master/plugin-gradle */
 	groovy {
-		licenseHeader ie3LicHead
-		excludeJava() // excludes all Java sources within the Groovy source dirs from formatting
+		target '**.groovy', 'Jenkinsfile'
+		licenseHeader "#!groovy\n\n" + ie3LicHead, "////////////////////////////////"
 		// the Groovy Eclipse formatter extends the Java Eclipse formatter,
 		// so it formats Java files by default (unless `excludeJava` is used).
 		greclipse()
+		indentWithSpaces 2
 	}
 
 	groovyGradle {
@@ -31,7 +32,7 @@ spotless {
 
 	//sets a license header, removes unused imports and formats conforming to the scala fmt formatter
 	scala {
-		scalafmt()
+		scalafmt('3.0.0').configFile('.scalafmt.conf')
 		licenseHeader ie3LicHead, "package.*\\n"
 	}
 

gradle/scripts/sonarqube.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists