Skip to content

Commit ec8a538

Browse files
committed
Clean up build settings
1 parent 29441da commit ec8a538

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

build.sbt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,14 @@ val commonSettings = Def.settings(
3535
publishMavenStyle := true,
3636
pomIncludeRepository := { _ => false },
3737

38-
publishTo in ThisBuild := sonatypePublishToBundle.value,
39-
publishArtifact in Test := false,
40-
publishArtifact in (Compile, packageDoc) := true,
41-
publishArtifact in (Compile, packageSrc) := true,
38+
ThisBuild / publishTo := sonatypePublishToBundle.value,
39+
Test / publishArtifact := false,
40+
Compile / packageDoc / publishArtifact := true,
41+
Compile / packageSrc / publishArtifact := true,
4242
sonatypeTimeoutMillis := 3 * 60 * 60 * 1000,
4343
publishConfiguration := publishConfiguration.value.withOverwrite(true),
4444
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true),
45-
publishArtifact in packageDoc := false,
46-
sources in (Compile, doc) := Seq.empty,
45+
Compile / doc / sources := Seq.empty,
4746
releasePublishArtifactsAction := PgpKeys.publishSigned.value,
4847
releaseProcess := Seq[ReleaseStep](
4948
checkSnapshotDependencies,
@@ -60,14 +59,9 @@ val commonSettings = Def.settings(
6059

6160
lazy val root: Project = project.in(file(".")).
6261
settings(
63-
publishArtifact in Compile := false,
62+
Compile / publishArtifact := false,
6463
publish := {},
6564
publishLocal := {},
66-
67-
clean := clean.dependsOn(
68-
clean in `scalajs-env-jsdom-nodejs`,
69-
clean in `test-project`
70-
).value
7165
).aggregate(`scalajs-env-jsdom-nodejs`, `test-project`)
7266

7367
lazy val `scalajs-env-jsdom-nodejs`: Project = project.in(file("jsdom-nodejs-env")).

version.sbt

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

0 commit comments

Comments
 (0)