Skip to content

Commit e08a889

Browse files
Merge branch 'dev' into ps/#545-GitHubActions
2 parents 1c68b23 + b01caba commit e08a889

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.3
1+
version = 3.8.1
22
runner.dialect = scala213
33

44
rewrite.trailingCommas.style = multiple

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
id 'java' //java support
44
id 'scala'
55
id 'pmd' // code check, working on source code
6-
id 'com.diffplug.spotless' version '6.25.0'//code format
6+
id 'com.diffplug.spotless' version '7.0.2'//code format
77
id 'com.github.spotbugs' version '6.1.7' // code check, working on byte code
88
id 'de.undercouch.download' version '5.6.0'
99
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1010
id "com.github.maiflai.scalatest" version "0.33" // run scalatest without specific spec task
11-
id "org.sonarqube" version "6.0.1.5171" // sonarqube
11+
id "org.sonarqube" version "6.1.0.5360" // sonarqube
1212
id "org.scoverage" version "8.1" // scala code coverage scoverage
1313
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
1414
}
@@ -21,7 +21,7 @@ ext {
2121
pekkoVersion = '1.1.3'
2222

2323
tscfgVersion = '0.9.995'
24-
scapegoatVersion = '3.1.6'
24+
scapegoatVersion = '3.1.7'
2525

2626
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator
2727
docsDirName = 'docs'

gradle/scripts/spotless.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ spotless {
2424
format 'misc', {
2525
target '**/.gitignore', 'configs/**'
2626
trimTrailingWhitespace()
27-
indentWithTabs()
27+
leadingSpacesToTabs()
2828
endWithNewline()
2929
}
3030

3131
/* Formats markdown files, just like the other misc files, but without trimming trailing white spaces (nested
3232
* enumerations) */
3333
format 'md', {
3434
target '**/*.md'
35-
indentWithSpaces 2
35+
leadingTabsToSpaces(2)
3636
endWithNewline()
3737
}
3838
}

src/main/scala/edu/ie3/osmogrid/mv/VoronoiPolygonSupport.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ object VoronoiPolygonSupport {
7575
* that are used to generate a voronoi diagram, and additional points that
7676
* are added to the polygons.
7777
* @param transitionPoints
78-
* i.e. hv to mv transition points
78+
* i.e. hv to mv transition points
7979
* @param additionalPoints
80-
* i.e. mv to lv transition points
80+
* i.e. mv to lv transition points
8181
* @param ctx
8282
* context
8383
* @tparam T

0 commit comments

Comments
 (0)