From f598aba7b497c307a3f3c0c089bfad35d18bc84b Mon Sep 17 00:00:00 2001 From: Philipp Schmelter Date: Fri, 16 Aug 2024 13:25:29 +0200 Subject: [PATCH] Reverted workaround in spotless.gradle. --- CHANGELOG.md | 1 + gradle/scripts/spotless.gradle | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be3de2d30c..31cf47e26a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,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) ### Fixed - Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658) 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 }