Skip to content

Commit

Permalink
Merge pull request #201 from scala-steward/update/sbt-1.6.2
Browse files Browse the repository at this point in the history
Update sbt to 1.6.2
  • Loading branch information
ChristopherDavenport committed Apr 16, 2022
2 parents ee90740 + 8c1489f commit 8fa6f06
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
17 changes: 8 additions & 9 deletions build.sbt
Expand Up @@ -16,9 +16,8 @@ lazy val selection = project.in(file("."))
.settings(commonSettings, releaseSettings, skipOnPublishSettings)
.aggregate(coreJVM, coreJS, docs)

lazy val core = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure)
.in(file("core"))
lazy val core = (file("core") / crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure))
.settings(commonSettings, releaseSettings, mimaSettings)
.settings(
name := "selection"
Expand Down Expand Up @@ -52,9 +51,9 @@ lazy val commonSettings = Seq(
crossScalaVersions := Seq(scalaVersion.value, "2.11.12"),
scalacOptions += "-Yrangepos",

scalacOptions in (Compile, doc) ++= Seq(
(Compile / doc / scalacOptions) ++= Seq(
"-groups",
"-sourcepath", (baseDirectory in LocalRootProject).value.getAbsolutePath,
"-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath,
"-doc-source-url", "https://github.com/christopherdavenport/selection/blob/v" + version.value + "€{FILE_PATH}.scala"
),

Expand Down Expand Up @@ -111,7 +110,7 @@ lazy val releaseSettings = {
password
)
).toSeq,
publishArtifact in Test := false,
(Test / publishArtifact) := false,
releasePublishArtifactsAction := PgpKeys.publishSigned.value,
scmInfo := Some(
ScmInfo(
Expand Down Expand Up @@ -161,8 +160,8 @@ lazy val micrositeSettings = {
"gray-lighter" -> "#F4F3F4",
"white-color" -> "#FFFFFF"
),
fork in tut := true,
scalacOptions in Tut --= Seq(
(tut / fork) := true,
(Tut / scalacOptions) --= Seq(
"-Xfatal-warnings",
"-Ywarn-unused-import",
"-Ywarn-numeric-widen",
Expand Down Expand Up @@ -235,7 +234,7 @@ lazy val mimaSettings = {
}

lazy val skipOnPublishSettings = Seq(
skip in publish := true,
(publish / skip) := true,
publish := (()),
publishLocal := (()),
publishArtifact := false,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.6.2
2 changes: 1 addition & 1 deletion version.sbt
@@ -1 +1 @@
version in ThisBuild := "0.1.1-SNAPSHOT"
(ThisBuild / version) := "0.1.1-SNAPSHOT"

0 comments on commit 8fa6f06

Please sign in to comment.