Skip to content

Commit

Permalink
Update Scalafmt
Browse files Browse the repository at this point in the history
  • Loading branch information
travisbrown committed Aug 26, 2021
1 parent 1bcb2e0 commit 4c5c3a6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version = 2.7.5
version = 3.0.0
continuationIndent.defnSite = 2
docstrings = JavaDoc
docstrings.style = Asterisk
docstrings.wrap = no
includeCurlyBraceInSelectChains = false
maxColumn = 120
newlines.alwaysBeforeElseAfterCurlyIf = false
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sbtcrossproject.{ CrossType, crossProject }

organization in ThisBuild := "io.circe"
ThisBuild / organization := "io.circe"

val compilerOptions = Seq(
"-deprecation",
Expand Down Expand Up @@ -40,17 +40,17 @@ val baseSettings = Seq(
"-Ywarn-unused:imports"
)
),
scalacOptions in (Compile, console) ~= {
Compile / console / scalacOptions ~= {
_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports"))
},
scalacOptions in (Test, console) ~= {
Test / console / scalacOptions ~= {
_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports"))
},
coverageHighlighting := true,
coverageEnabled := (
if (priorTo2_13(scalaVersion.value)) false else coverageEnabled.value
),
(scalastyleSources in Compile) ++= (unmanagedSourceDirectories in Compile).value
Compile / scalastyleSources ++= (Compile / unmanagedSourceDirectories).value
)

val allSettings = baseSettings ++ publishSettings
Expand Down Expand Up @@ -78,7 +78,7 @@ lazy val optics = crossProject(JSPlatform, JVMPlatform)
),
ghpagesNoJekyll := true,
docMappingsApiDir := "api",
addMappingsToSiteDir(mappings in (Compile, packageDoc), docMappingsApiDir)
addMappingsToSiteDir(Compile / packageDoc / mappings, docMappingsApiDir)
)
.jsSettings(
libraryDependencies +=
Expand All @@ -96,7 +96,7 @@ lazy val publishSettings = Seq(
homepage := Some(url("https://github.com/circe/circe-optics")),
licenses := Seq("Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
publishMavenStyle := true,
publishArtifact in Test := false,
Test / publishArtifact := false,
pomIncludeRepository := { _ => false },
publishTo := {
val nexus = "https://oss.sonatype.org/"
Expand Down

0 comments on commit 4c5c3a6

Please sign in to comment.