Merge pull request #134 from ie3-institute/sp/#133-gradle-8.4

Update to gradle 8.4

Author: danielfeismann

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+### Changed
+- Updating to gradle 8.4 [#133](https://github.com/ie3-institute/simonaAPI/issues/133)
+
 ## [0.2.0] - 2023-08-01
 
 ### Added

build.gradle

@@ -23,8 +23,11 @@ ext {
 
 group = 'com.github.ie3-institute'
 description = 'simonaAPI'
-sourceCompatibility = javaVersion
-targetCompatibility = javaVersion
+
+java {
+  sourceCompatibility = javaVersion
+  targetCompatibility = javaVersion
+}
 
 apply from: scriptsLocation + 'spotless.gradle'
 apply from: scriptsLocation + 'pmd.gradle'

gradle/scripts/documentation.gradle

@@ -1,5 +1,3 @@
-def docBaseDirPath = project.projectDir.toString() + File.separator + project.docsDirName.toString() + File.separator
-
 /*
  * Additional tasks, that are defined by default:
  *   - sphinx -> Generate HTML output of *.rst files in <projectDir>/docs/readthedocs
@@ -13,6 +11,6 @@ javadoc() {
   group 'Documentation'
 
   source = sourceSets.main.allJava
-  classpath = project.sourceSets.main.compileClasspath
+  classpath = sourceSets.main.compileClasspath
 }
 

gradle/scripts/jacoco.gradle

@@ -12,7 +12,7 @@ jacocoTestReport {
     xml.required = true
     csv.required = false
     html.required = true
-    html.destination file("${buildDir}/reports/jacoco")
+    html.outputLocation = layout.buildDirectory.dir("reports/jacoco")
   }
 
   // what to exclude from coverage report (files that should not be analyzed!)
@@ -28,7 +28,7 @@ jacocoTestReport {
   ]
 
   getClassDirectories().setFrom(fileTree(
-      dir: "$buildDir/classes/",
+      dir: "${layout.buildDirectory}/classes/",
       excludes: excludes
       ))
 

gradle/scripts/spotless.gradle

@@ -20,14 +20,16 @@ spotless {
     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()
+    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
+    greclipse('4.27')
     indentWithSpaces 2
   }
 
   groovyGradle {
     // same as groovy, but for .gradle (defaults to '*.gradle')
     target '*.gradle', 'gradle/scripts/*.gradle'
-    greclipse()
+    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
+    greclipse('4.27')
     indentWithSpaces 2
   }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists