Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sbt to 1.10.1 #296

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ val sharedSettings = Seq(
scalaVersion := V.scala,

// Lets me C-c out of the running process.
cancelable in Global := true,
parallelExecution in Test := true,
scalafmtOnCompile in ThisBuild := true,
wartremoverErrors in (ThisBuild, compile) ++= unsafeWartsExcept(ignoredWarts),
unmanagedBase in Global := baseDirectory.value / "lib",
(Global / cancelable) := true,
(Test / parallelExecution) := true,
(ThisBuild / scalafmtOnCompile) := true,
(ThisBuild / compile / wartremoverErrors) ++= unsafeWartsExcept(ignoredWarts),
(Global / unmanagedBase) := baseDirectory.value / "lib",
resolvers ++= Seq(
Resolver.bintrayRepo("cibotech", "public")
),
Expand All @@ -64,15 +64,15 @@ val sharedSettings = Seq(
"-language:existentials"),


scalacOptions in (Compile, console) --= consoleExclusions,
scalacOptions in (Test, console) --= consoleExclusions,
(Compile / console / scalacOptions) --= consoleExclusions,
(Test / console / scalacOptions) --= consoleExclusions,

// Publishing options:
releaseCrossBuild := true,
releasePublishArtifactsAction := PgpKeys.publishSigned.value,
releaseVersionBump := sbtrelease.Version.Bump.Minor, // need to tweak based on mima results
publishMavenStyle := true,
publishArtifact in Test := false,
(Test / publishArtifact) := false,
pomIncludeRepository := { x => false },

publishTo := Some(
Expand Down Expand Up @@ -189,7 +189,7 @@ import com.stripe.rainier.compute.{Evaluator, Real}
implicit val rng: RNG = RNG.default
implicit val evaluator: Numeric[Real] = new Evaluator(Map.empty)
""".stripMargin('|'),
mainClass in (Compile, run) := Some("scalarl.book.Chapter2"),
(Compile / run / mainClass) := Some("scalarl.book.Chapter2"),
).dependsOn(rlCore, rlPlot, rlWorld)

lazy val docsMappingsAPIDir = settingKey[String]("Name of subdirectory in site target directory for api docs")
Expand Down Expand Up @@ -237,23 +237,23 @@ lazy val docSettings = Seq(
"white-color" -> "#FFFFFF"),

autoAPIMappings := true,
unidocProjectFilter in (ScalaUnidoc, unidoc) :=
(ScalaUnidoc / unidoc / unidocProjectFilter) :=
inProjects(docsSourcesAndProjects:_*),
docsMappingsAPIDir := "api",
addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc), docsMappingsAPIDir),
addMappingsToSiteDir((ScalaUnidoc / packageDoc / mappings), docsMappingsAPIDir),
ghpagesNoJekyll := false,

// Don't kill the cname redirect.
excludeFilter in ghpagesCleanSite :=
(ghpagesCleanSite / excludeFilter) :=
new FileFilter{
def accept(f: File) = (ghpagesRepository.value / "CNAME").getCanonicalPath == f.getCanonicalPath
} || "versions.html",

fork in tut := true,
fork in (ScalaUnidoc, unidoc) := true,
scalacOptions in (ScalaUnidoc, unidoc) ++= Seq(
(tut / fork) := true,
(ScalaUnidoc / unidoc / fork) := true,
(ScalaUnidoc / unidoc / scalacOptions) ++= Seq(
"-doc-source-url", "https://github.com/sritchie/scala-rl/tree/develop€{FILE_PATH}.scala",
"-sourcepath", baseDirectory.in(LocalRootProject).value.getAbsolutePath,
"-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath,
// "-diagrams", // Not working locally; wait until graphviz is reliable.
"-doc-root-content", "scaladoc-root.txt"
),
Expand All @@ -268,5 +268,5 @@ lazy val docs = project
.settings(sharedSettings)
.settings(noPublishSettings)
.settings(docSettings)
.settings((scalacOptions in Tut) ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code"))))
.settings(((Tut / scalacOptions)) ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code"))))
.dependsOn(rlCore, rlPlot, rlBook, rlWorld)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.13
sbt.version=1.10.1