Skip to content

Commit

Permalink
Merge abf2e63 into 61d38e6
Browse files Browse the repository at this point in the history
  • Loading branch information
RCMartins committed May 9, 2021
2 parents 61d38e6 + abf2e63 commit db460b5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions build.sbt
Expand Up @@ -7,7 +7,7 @@ import sbt.util.FileInfo
import scoverage.ScoverageKeys.coverageFailOnMinimum
import complete.DefaultParsers._

val semanticdbScalac = "4.4.15"
val semanticdbScalac = "4.4.16"

lazy val V = _root_.scalafix.sbt.BuildInfo
inThisBuild(
Expand Down Expand Up @@ -37,8 +37,8 @@ inThisBuild(
scalacOptions -= (if (sys.env.contains("CI") && !sys.env.contains("BLINKY")) ""
else "-Xfatal-warnings"),
coverageEnabled := false,
fork in Test := false,
skip in publish := true
Test / fork := false,
publish / skip := true
)
)

Expand All @@ -47,15 +47,15 @@ Global / fileInputExcludeFilter := ((_: Path, _: FileAttributes) => false)
Global / onChangedBuildSource := ReloadOnSourceChanges

lazy val stableVersion = Def.setting {
version.in(ThisBuild).value.replaceAll("\\+.*", "")
(ThisBuild / version).value.replaceAll("\\+.*", "")
}

lazy val core =
project
.in(file("blinky-core"))
.enablePlugins(BuildInfoPlugin)
.settings(
skip in publish := false,
publish / skip := false,
moduleName := "blinky",
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % V.scalafixVersion,
libraryDependencies += "com.typesafe.play" %% "play-json" % "2.9.2",
Expand Down Expand Up @@ -86,7 +86,7 @@ lazy val output =
scalacOptions := Seq.empty,
Compile / sourceGenerators += Def.task {
val sourcesFolder = file((Compile / scalaSource).value.toString + "-output")
val generatedFolder = (sourceManaged in Compile).value
val generatedFolder = (Compile / sourceManaged).value

val cachedFunc =
FileFunction.cached(
Expand All @@ -103,7 +103,7 @@ lazy val cli =
project
.in(file("blinky-cli"))
.settings(
skip in publish := false,
publish / skip := false,
moduleName := "blinky-cli",
libraryDependencies += "com.geirsson" %% "metaconfig-core" % "0.9.11",
libraryDependencies += "com.geirsson" %% "metaconfig-typesafe-config" % "0.9.11",
Expand All @@ -127,11 +127,11 @@ lazy val tests =
scalafixTestkitV(scalaVersion.value) % Test cross CrossVersion.full,
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.8" % Test,
scalafixTestkitOutputSourceDirectories :=
sourceDirectories.in(output, Compile).value,
(output / Compile / sourceDirectories).value,
scalafixTestkitInputSourceDirectories :=
sourceDirectories.in(input, Compile).value,
(input / Compile / sourceDirectories).value,
scalafixTestkitInputClasspath :=
fullClasspath.in(input, Compile).value
(input / Compile / fullClasspath).value
)
.dependsOn(core, output)

Expand All @@ -140,7 +140,7 @@ lazy val docs =
.in(file("blinky-docs"))
.enablePlugins(MdocPlugin, DocusaurusPlugin)
.settings(
mdoc := run.in(Compile).evaluated
mdoc := (Compile / run).evaluated
)
.dependsOn(core)

Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
Expand Up @@ -2,7 +2,7 @@ lazy val preProcess =
project
.in(file("."))
.settings(
skip in publish := false,
publish / skip := false,
moduleName := "pre-process",
libraryDependencies += "com.github.pathikrit" %% "better-files" % "3.9.1",
libraryDependencies += "com.lihaoyi" %% "ammonite-ops" % "2.3.8"
Expand Down

0 comments on commit db460b5

Please sign in to comment.