diff --git a/CHANGELOG.md b/CHANGELOG.md index fb09cabbf4..e2901078f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Harmonised both methods that check the inner temperature of thermal house against the boundaries [#880](https://github.com/ie3-institute/simona/issues/880) - Convert all `eval-rst` instances in rtd to myst syntax [#901](https://github.com/ie3-institute/simona/issues/901) - External simulation should provide information about next tick of MobSim [#776](https://github.com/ie3-institute/simona/issues/776) +- Reverted temporary workaround in `spotless.gradle` [#681](https://github.com/ie3-institute/simona/issues/681) - Updated AUTHORS.md [#904](https://github.com/ie3-institute/simona/issues/904) - Updated AUTHORS.md [#905](https://github.com/ie3-institute/simona/issues/905) - Prepare ThermalStorageTestData for Storage without storageVolumeLvlMin [#894](https://github.com/ie3-institute/simona/issues/894) diff --git a/gradle/scripts/spotless.gradle b/gradle/scripts/spotless.gradle index 104ff70c86..f127f2bdd5 100644 --- a/gradle/scripts/spotless.gradle +++ b/gradle/scripts/spotless.gradle @@ -19,16 +19,14 @@ spotless { licenseHeader 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').configFile('greclipse.properties') + greclipse().configFile('greclipse.properties') 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') + greclipse() indentWithSpaces 2 }