Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 722b9e9

Browse files
authored
Bump sbt; fix scalafmt errors (#92)
1 parent 4a56a72 commit 722b9e9

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.bloop
2+
.bsp
23
.cache
34
.idea
45
.metals

.scalafmt.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ align {
55
ifWhileOpenParen = false
66
openParenCallSite = false
77
openParenDefnSite = false
8-
tokens.add = [
8+
tokens."+"= [
99
"%",
1010
"%%",
1111
"<-",
@@ -16,7 +16,7 @@ align {
1616
assumeStandardLibraryStripMargin = true
1717
continuationIndent.defnSite = 2
1818
continuationIndent.callSite = 2
19-
docstrings = JavaDoc
19+
docstrings.style = Asterisk
2020
maxColumn = 110
2121
newlines.implicitParamListModifierPrefer = before
2222
project {

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.9
1+
sbt.version=1.5.5

src/main/scala/org/scalastyle/sbt/Plugin.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ object ScalastylePlugin extends AutoPlugin {
129129
scalastyleSources := (unmanagedSourceDirectories in Compile).value,
130130
(scalastyleSources in Test) := (unmanagedSourceDirectories in Test).value
131131
) ++
132-
Project.inConfig(Compile)(rawScalastyleSettings()) ++
133-
Project.inConfig(Test)(rawScalastyleSettings())
132+
Project.inConfig(Compile)(rawScalastyleSettings()) ++
133+
Project.inConfig(Test)(rawScalastyleSettings())
134134
}
135135

136136
object Tasks {
@@ -309,7 +309,8 @@ object Tasks {
309309
/**
310310
* Report style warnings prettily to sbt logger.
311311
*
312-
* @todo factor with TextOutput from scalastyle Output.scala
312+
* @todo
313+
* factor with TextOutput from scalastyle Output.scala
313314
*/
314315
private[sbt] class SbtLogOutput[T <: FileSpec](
315316
config: Config,
@@ -341,7 +342,7 @@ private[sbt] class SbtLogOutput[T <: FileSpec](
341342
if (!silent) {
342343
plevel(level)(
343344
location(file, line, column) + ": " +
344-
Output.findMessage(messageHelper, key, args, customMessage)
345+
Output.findMessage(messageHelper, key, args, customMessage)
345346
)
346347
}
347348
case StyleException(file, clazz, message, stacktrace, line, column) =>
@@ -357,5 +358,5 @@ private[sbt] class SbtLogOutput[T <: FileSpec](
357358

358359
private[this] def location(file: T, line: Option[Int], column: Option[Int]): String =
359360
file.name +
360-
line.map(n => ":" + n + column.map(":" + _).getOrElse("")).getOrElse("")
361+
line.map(n => ":" + n + column.map(":" + _).getOrElse("")).getOrElse("")
361362
}

0 commit comments

Comments
 (0)