Skip to content

Commit ad140d5

Browse files
authored
Update scalafmt-core to 3.0.0
1 parent 65a7bc0 commit ad140d5

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.scalafmt.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.7.5
1+
version=3.0.0
22
style = defaultWithAlign
33
maxColumn = 100
44

@@ -15,9 +15,9 @@ align {
1515
openParenDefnSite = false
1616
}
1717

18-
docstrings = JavaDoc
18+
docstrings.style = Asterisk
1919

2020
rewrite {
2121
rules = [SortImports, RedundantBraces]
2222
redundantBraces.maxLines = 1
23-
}
23+
}

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import com.jsuereth.sbtpgp.PgpKeys.publishSigned
22

3-
ThisBuild / organization := "org.scala-exercises"
3+
ThisBuild / organization := "org.scala-exercises"
44
ThisBuild / githubOrganization := "47degrees"
5-
ThisBuild / scalaVersion := "2.13.3"
5+
ThisBuild / scalaVersion := "2.13.3"
66

77
// This is required by the exercises compiler:
8-
publishLocal := (publishLocal dependsOn compile).value
8+
publishLocal := (publishLocal dependsOn compile).value
99
publishSigned := (publishSigned dependsOn compile).value
1010

1111
addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; test")

src/main/scala/templatelib/MyLibrary.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import org.scalaexercises.definitions._
2020
/**
2121
* This is the description of the library as it will appear in the Scala Exercises website.
2222
*
23-
* @param name template
23+
* @param name
24+
* template
2425
*/
2526
object MyLibrary extends Library {
2627
override def owner = "scala-exercises"

src/main/scala/templatelib/SectionA.scala

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ import org.scalaexercises.definitions._
2121
import org.scalatest.flatspec.AnyFlatSpec
2222

2323
/**
24-
* @param name section_title
24+
* @param name
25+
* section_title
2526
*/
2627
object SectionA extends AnyFlatSpec with Matchers with Section {
2728

2829
/**
29-
* = Exercise block title =
30+
* =Exercise block title=
3031
*
3132
* Text describing background about the exercise, can be as long as needed.
3233
*
@@ -40,8 +41,8 @@ object SectionA extends AnyFlatSpec with Matchers with Section {
4041
true shouldBe res0
4142

4243
/**
43-
* And obviously you can add as many documentation and exercises as you need
44-
* to make your point ;-).
44+
* And obviously you can add as many documentation and exercises as you need to make your point
45+
* ;-).
4546
*/
4647
def functionFalseAssert(res0: Boolean): Unit =
4748
false shouldBe res0

0 commit comments

Comments
 (0)