From fbe2203a8ecb4eef2cb0cab1e8b894030798f6d9 Mon Sep 17 00:00:00 2001 From: David Barri Date: Thu, 26 Aug 2021 13:10:24 +1000 Subject: [PATCH 1/2] Fix #504 Our release GitHub Actions job performs the release for SJS 0.6 and 1.0 in parallel. This prevents each parallel processes from removing each other's deployment. --- build.sbt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.sbt b/build.sbt index 50c7abe3a..5ddeaf583 100644 --- a/build.sbt +++ b/build.sbt @@ -3,6 +3,11 @@ import scalatex.ScalatexReadme ThisBuild / shellPrompt := ((s: State) => Project.extract(s).currentRef.project + "> ") +// Issue #504 - remove on 2.x branch +// Our release GitHub Actions job performs the release for SJS 0.6 and 1.0 in parallel. +// This prevents each parallel processes from removing each other's deployment. +sonatypeSessionName := s"${name.value} v${version.value} (SJS $scalaJSVersion)" + lazy val scalafixRules = project .in(file("scalafix")) .settings( From 62a6abb7834ff70c5caaa7c2101b193b63bdbcc3 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 25 Aug 2021 22:31:20 -0700 Subject: [PATCH 2/2] Hard code version to 1.2.0 --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 5ddeaf583..ab0229f41 100644 --- a/build.sbt +++ b/build.sbt @@ -22,6 +22,7 @@ lazy val root = project name := "Scala.js DOM" +ThisBuild / version := "1.2.0" ThisBuild / crossScalaVersions := { if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1") else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")