Skip to content

Bump sbt tooling #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2021
Merged

Bump sbt tooling #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29441da
Bump sbt tooling
exoego Jun 7, 2021
ec8a538
Clean up build settings
exoego Jun 7, 2021
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
18 changes: 6 additions & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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")).
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.10
sbt.version=1.5.3
6 changes: 3 additions & 3 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "2.0.1-SNAPSHOT"
ThisBuild / version := "2.0.1-SNAPSHOT"