diff --git a/build.sbt b/build.sbt index b083a0e..1be238a 100644 --- a/build.sbt +++ b/build.sbt @@ -35,15 +35,14 @@ val commonSettings = Def.settings( publishMavenStyle := true, pomIncludeRepository := { _ => false }, - publishTo in ThisBuild := sonatypePublishToBundle.value, - publishArtifact in Test := false, - publishArtifact in (Compile, packageDoc) := true, - publishArtifact in (Compile, packageSrc) := true, + ThisBuild / publishTo := sonatypePublishToBundle.value, + Test / publishArtifact := false, + Compile / packageDoc / publishArtifact := true, + Compile / packageSrc / publishArtifact := true, sonatypeTimeoutMillis := 3 * 60 * 60 * 1000, publishConfiguration := publishConfiguration.value.withOverwrite(true), publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true), - publishArtifact in packageDoc := false, - sources in (Compile, doc) := Seq.empty, + Compile / doc / sources := Seq.empty, releasePublishArtifactsAction := PgpKeys.publishSigned.value, releaseProcess := Seq[ReleaseStep]( checkSnapshotDependencies, @@ -60,14 +59,9 @@ val commonSettings = Def.settings( lazy val root: Project = project.in(file(".")). settings( - publishArtifact in Compile := false, + Compile / publishArtifact := false, publish := {}, publishLocal := {}, - - clean := clean.dependsOn( - clean in `scalajs-env-jsdom-nodejs`, - clean in `test-project` - ).value ).aggregate(`scalajs-env-jsdom-nodejs`, `test-project`) lazy val `scalajs-env-jsdom-nodejs`: Project = project.in(file("jsdom-nodejs-env")). diff --git a/project/build.properties b/project/build.properties index 797e7cc..67d27a1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.10 +sbt.version=1.5.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 5840ed6..3e5853f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.1" diff --git a/version.sbt b/version.sbt index c670469..14cae95 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "2.0.1-SNAPSHOT" +ThisBuild / version := "2.0.1-SNAPSHOT"