Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Address sbt warnings #414

Merged
merged 2 commits into from
Sep 4, 2021
Merged
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
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
lazy val scala213 = "2.13.6"
lazy val scala212 = "2.12.14"
organization in ThisBuild := "net.exoego"
crossScalaVersions in ThisBuild := Seq(scala213, scala212)
scalaVersion in ThisBuild := scala213
ThisBuild / organization := "net.exoego"
ThisBuild / crossScalaVersions := Seq(scala213, scala212)
ThisBuild / scalaVersion := scala213
Global / excludeLintKeys ++= Set(publishArtifact, scalacOptions)

lazy val root = {
val p = (project in file("."))
Expand Down Expand Up @@ -54,7 +55,7 @@ def createNodeVersionSpecificProject(nodeFullVersion: String) = {
.settings(MySettings.commonMacroParadiseSetting)
.settings(MySettings.publishingSettings)
.settings(
unmanagedSourceDirectories in Compile ++= {
Compile / unmanagedSourceDirectories ++= {
val symlinkDir = baseDirectory.value / "src" / "main"
val hasSymlink = symlinkDir.exists && symlinkDir.isDirectory
Seq(file("app") / "nodejs-v14" / "src" / "main" / "scala").filter(_ => majorVersion != "14" && !hasSymlink)
Expand Down
16 changes: 8 additions & 8 deletions project/MySettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ object MySettings {
"-feature",
"-language:implicitConversions"
) ++ lintSettings.value,
scalacOptions in Compile in compile ++= Seq(
Compile / compile / scalacOptions ++= Seq(
"-Xfatal-warnings"
),
scalacOptions in Compile in doc ++= Seq(
Compile / doc / scalacOptions ++= Seq(
"-Xfatal-warnings",
"-no-link-warnings"
),
Expand All @@ -58,7 +58,7 @@ object MySettings {
scalaJSLinkerConfig ~= {
_.withModuleKind(ModuleKind.CommonJSModule)
},
logBuffered in Test := true
Test / logBuffered := true
)

lazy val commonMacroParadiseSetting = Seq(
Expand All @@ -77,7 +77,7 @@ object MySettings {
)

lazy val nonPublishingSetting = Seq(
skip in publish := true,
publish / skip := true,
publishArtifact := false,
publish := {},
publishLocal := {}
Expand All @@ -101,10 +101,10 @@ object MySettings {
)
),
publishMavenStyle := true,
publishArtifact in Test := false,
publishArtifact in (Compile, packageDoc) := true,
publishArtifact in (Compile, packageSrc) := true,
publishArtifact in packageDoc := true,
Test / publishArtifact := false,
Compile / packageDoc / publishArtifact := true,
Compile / packageSrc / publishArtifact := true,
packageDoc / publishArtifact := true,
pomIncludeRepository := { _ =>
false
},
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.13.0"
ThisBuild / version := "0.13.0"