Skip to content

Commit 98c8ff7

Browse files
Merge branch 'dev' into ms/#1221-fix-connectivity-check-for-open-switches
2 parents e803eff + de1b2fd commit 98c8ff7

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2424
- Converted `MappingEntry` into a normal class [#1087](https://github.com/ie3-institute/PowerSystemDataModel/issues/1087)
2525
- Renamed timeseries mapping `participant` column to `asset` [#1191](https://github.com/ie3-institute/PowerSystemDataModel/issues/1191)
2626
- Removed attribute `dsm` from `LoadInput` [#1195](https://github.com/ie3-institute/PowerSystemDataModel/issues/1195)
27+
- Fix spotless deprecations [#1123](https://github.com/ie3-institute/PowerSystemDataModel/issues/1223)
2728

2829
## [5.1.0] - 2024-06-24
2930

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ dependencies {
7373
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
7474
testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
7575
testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
76-
testImplementation 'net.bytebuddy:byte-buddy:1.16.1' // Mocks of classes
76+
testImplementation 'net.bytebuddy:byte-buddy:1.17.0' // Mocks of classes
7777

7878
// testcontainers (docker framework for testing)
7979
testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"

gradle/scripts/spotless.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ spotless {
2222
// the Groovy Eclipse formatter extends the Java Eclipse formatter,
2323
// so it formats Java files by default (unless `excludeJava` is used).
2424
greclipse().configFile('greclipse.properties')
25-
indentWithSpaces 2
25+
leadingTabsToSpaces 2
2626
}
2727

2828
groovyGradle {
2929
// same as groovy, but for .gradle (defaults to '*.gradle')
3030
target '*.gradle', 'gradle/scripts/*.gradle'
3131
greclipse()
32-
indentWithSpaces 2
32+
leadingTabsToSpaces 2
3333
}
3434

3535
// removes unnecessary whitespace, indents with tabs and ends on new line for gradle, md and gitignore files and config-XMLs
3636
format 'misc', {
3737
target '**/.gitignore', 'configs/**'
3838
trimTrailingWhitespace()
39-
indentWithTabs()
39+
leadingSpacesToTabs()
4040
endWithNewline()
4141
}
4242
}

0 commit comments

Comments
 (0)