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

Commit db99aa0

Browse files
authored
Merge pull request #414 from exoego/sbt-migration
Address sbt warnings
2 parents a4878e8 + 86669f3 commit db99aa0

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

build.sbt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
lazy val scala213 = "2.13.6"
22
lazy val scala212 = "2.12.14"
3-
organization in ThisBuild := "net.exoego"
4-
crossScalaVersions in ThisBuild := Seq(scala213, scala212)
5-
scalaVersion in ThisBuild := scala213
3+
ThisBuild / organization := "net.exoego"
4+
ThisBuild / crossScalaVersions := Seq(scala213, scala212)
5+
ThisBuild / scalaVersion := scala213
6+
Global / excludeLintKeys ++= Set(publishArtifact, scalacOptions)
67

78
lazy val root = {
89
val p = (project in file("."))
@@ -54,7 +55,7 @@ def createNodeVersionSpecificProject(nodeFullVersion: String) = {
5455
.settings(MySettings.commonMacroParadiseSetting)
5556
.settings(MySettings.publishingSettings)
5657
.settings(
57-
unmanagedSourceDirectories in Compile ++= {
58+
Compile / unmanagedSourceDirectories ++= {
5859
val symlinkDir = baseDirectory.value / "src" / "main"
5960
val hasSymlink = symlinkDir.exists && symlinkDir.isDirectory
6061
Seq(file("app") / "nodejs-v14" / "src" / "main" / "scala").filter(_ => majorVersion != "14" && !hasSymlink)

project/MySettings.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ object MySettings {
4444
"-feature",
4545
"-language:implicitConversions"
4646
) ++ lintSettings.value,
47-
scalacOptions in Compile in compile ++= Seq(
47+
Compile / compile / scalacOptions ++= Seq(
4848
"-Xfatal-warnings"
4949
),
50-
scalacOptions in Compile in doc ++= Seq(
50+
Compile / doc / scalacOptions ++= Seq(
5151
"-Xfatal-warnings",
5252
"-no-link-warnings"
5353
),
@@ -58,7 +58,7 @@ object MySettings {
5858
scalaJSLinkerConfig ~= {
5959
_.withModuleKind(ModuleKind.CommonJSModule)
6060
},
61-
logBuffered in Test := true
61+
Test / logBuffered := true
6262
)
6363

6464
lazy val commonMacroParadiseSetting = Seq(
@@ -77,7 +77,7 @@ object MySettings {
7777
)
7878

7979
lazy val nonPublishingSetting = Seq(
80-
skip in publish := true,
80+
publish / skip := true,
8181
publishArtifact := false,
8282
publish := {},
8383
publishLocal := {}
@@ -101,10 +101,10 @@ object MySettings {
101101
)
102102
),
103103
publishMavenStyle := true,
104-
publishArtifact in Test := false,
105-
publishArtifact in (Compile, packageDoc) := true,
106-
publishArtifact in (Compile, packageSrc) := true,
107-
publishArtifact in packageDoc := true,
104+
Test / publishArtifact := false,
105+
Compile / packageDoc / publishArtifact := true,
106+
Compile / packageSrc / publishArtifact := true,
107+
packageDoc / publishArtifact := true,
108108
pomIncludeRepository := { _ =>
109109
false
110110
},

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "0.13.0"
1+
ThisBuild / version := "0.13.0"

0 commit comments

Comments
 (0)