Upgraded Scala.js to v1.5.1

scommons · Jul 15, 2022 · 45262fd · 45262fd
1 parent 85a99b5
commit 45262fd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![CI](https://github.com/scommons/scommons-api/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/scommons/scommons-api/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/scommons/scommons-api/badge.svg?branch=master)](https://coveralls.io/github/scommons/scommons-api?branch=master)
 [![scala-index](https://index.scala-lang.org/scommons/scommons-api/scommons-api-core/latest.svg)](https://index.scala-lang.org/scommons/scommons-api/scommons-api-core)
-[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.1.0.svg)](https://www.scala-js.org)
+[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.5.0.svg)](https://www.scala-js.org)
 
 ## scommons-api
 Common REST API Scala/Scala.js components

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ lazy val `scommons-api` = (project in file("."))
   .settings(CommonModule.settings: _*)
   .settings(ApiModule.settings: _*)
   .settings(
-    skip in publish := true,
+    publish / skip := true,
     publish := ((): Unit),
     publishLocal := ((): Unit),
     publishM2 := ((): Unit)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.2.8
+sbt.version = 1.5.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,11 +1,11 @@
 //resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-//addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0-SNAPSHOT").changing())
-addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0")
+addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.9.0-SNAPSHOT").changing())
+//addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
diff --git a/project/src/main/scala/definitions/ApiModule.scala b/project/src/main/scala/definitions/ApiModule.scala
@@ -25,7 +25,7 @@ object ApiModule {
     //
     sonatypeProfileName := "org.scommons",
     publishMavenStyle := true,
-    publishArtifact in Test := false,
+    Test / publishArtifact := false,
     publishTo := sonatypePublishToBundle.value,
     pomExtra := {
       <url>https://github.com/scommons/scommons-api</url>

diff --git a/project/src/main/scala/definitions/ScalaJsModule.scala b/project/src/main/scala/definitions/ScalaJsModule.scala
@@ -2,40 +2,17 @@ package definitions
 
 import org.scalajs.jsenv.nodejs.NodeJSEnv
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
-import sbt.Keys._
 import sbt._
-import scoverage.ScoverageKeys.{coverageEnabled, coverageScalacPluginVersion}
 
 object ScalaJsModule {
 
   val settings: Seq[Setting[_]] = Seq(
     // required for node.js >= v12.12.0
     // see:
     //   https://github.com/nodejs/node/pull/29919
-    jsEnv in Test := new NodeJSEnv(NodeJSEnv.Config().withArgs(List("--enable-source-maps"))),
-    scalaJSLinkerConfig in Test ~= {
+    Test / jsEnv := new NodeJSEnv(NodeJSEnv.Config().withArgs(List("--enable-source-maps"))),
+    Test / scalaJSLinkerConfig ~= {
       _.withSourceMap(true)
-    },
-
-    //TODO: remove these temporal fixes for Scala.js 1.1+ and scoverage
-    coverageScalacPluginVersion := {
-      val current = coverageScalacPluginVersion.value
-      if (scalaJSVersion.startsWith("0.6")) current
-      else "1.4.2" //the only version that supports Scala.js 1.1+
-    },
-    libraryDependencies ~= { modules =>
-      if (scalaJSVersion.startsWith("0.6")) modules
-      else modules.filter(_.organization != "org.scoverage")
-    },
-    libraryDependencies ++= {
-      if (coverageEnabled.value) {
-        if (scalaJSVersion.startsWith("0.6")) Nil
-        else Seq(
-          "org.scoverage" %% "scalac-scoverage-runtime_sjs1" % coverageScalacPluginVersion.value,
-          "org.scoverage" %% "scalac-scoverage-plugin" % coverageScalacPluginVersion.value % "scoveragePlugin"
-        )
-      }
-      else Nil
     }
   )
 }
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := sys.env.getOrElse("version", default = "1.0.0-SNAPSHOT").stripPrefix("v")
+ThisBuild / version := sys.env.getOrElse("version", default = "1.0.0-SNAPSHOT").stripPrefix("v")