Merge pull request #302 from ie3-institute/df/#301-Spotless-automatic…

…ally-add-trailing-commas

Spotless automatically add trailing commas

.scalafmt.conf

@@ -1 +1,4 @@
-version = 2.7.5
+version = 3.7.3
+runner.dialect = scala213
+
+rewrite.trailingCommas.style = multiple

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Change from quantities to squants [#257](https://github.com/ie3-institute/MobilitySimulator/issues/257)
 - MobSim informs EVCS in SIMONA about estimated next arrivals [#254](https://github.com/ie3-institute/MobilitySimulator/issues/254)
 - Updated `Gradle` to version V8.10 [#282](https://github.com/ie3-institute/MobilitySimulator/issues/282)
+- Changed Spotless to format with trailing commas [#301](https://github.com/ie3-institute/MobilitySimulator/issues/301)
 
 ### Fixed
 - Adapting to SIMONA-API changes introduced by [PR#37](https://github.com/ie3-institute/simonaAPI/pull/37) [[#7](https://github.com/ie3-institute/MobilitySimulator/issues/7)]

gradle/scripts/spotless.gradle

@@ -13,22 +13,18 @@ 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).
-    // 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'
-    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
-    greclipse('4.27')
     indentWithSpaces 2
   }
 
   //sets a license header, removes unused imports and formats conforming to the scala fmt formatter
   scala {
-    scalafmt()
+    scalafmt().configFile(".scalafmt.conf")
     licenseHeader ie3LicHead, "package.*\\n"
   }