Upgraded scommons libs

scommons · Feb 8, 2022 · 3524653 · 3524653
1 parent b4ab6be
commit 3524653
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 //resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-//addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.7.0-SNAPSHOT").changing())
-addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.7.0")
+//addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.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")

diff --git a/project/src/main/scala/common/Libs.scala b/project/src/main/scala/common/Libs.scala
@@ -6,8 +6,8 @@ import scommons.sbtplugin.project.CommonLibs
 
 object Libs extends CommonLibs {
 
-  val scommonsNodejsVersion = "0.7.0"
-  val scommonsReactVersion = "0.7.0"
+  val scommonsNodejsVersion = "0.8.0"
+  val scommonsReactVersion = "0.8.0"
 
   lazy val scommonsNodejsCore = Def.setting("org.scommons.nodejs" %%% "scommons-nodejs-core" % scommonsNodejsVersion)
   lazy val scommonsReactCore = Def.setting("org.scommons.react" %%% "scommons-react-core" % scommonsReactVersion)

diff --git a/project/src/main/scala/definitions/NodeJsModule.scala b/project/src/main/scala/definitions/NodeJsModule.scala
@@ -5,7 +5,6 @@ import sbt.Keys._
 import sbt._
 import scommons.sbtplugin.project.CommonNodeJsModule
 import scoverage.ScoverageKeys.{coverageEnabled, coverageScalacPluginVersion}
-import scoverage.ScoverageSbtPlugin._
 
 trait NodeJsModule extends MaterialUiModule with CommonNodeJsModule {
 
@@ -20,14 +19,14 @@ trait NodeJsModule extends MaterialUiModule with CommonNodeJsModule {
         },
         libraryDependencies ~= { modules =>
           if (scalaJSVersion.startsWith("0.6")) modules
-          else modules.filter(_.organization != OrgScoverage)
+          else modules.filter(_.organization != "org.scoverage")
         },
         libraryDependencies ++= {
           if (coverageEnabled.value) {
             if (scalaJSVersion.startsWith("0.6")) Nil
             else Seq(
-              OrgScoverage %% s"${ScalacRuntimeArtifact}_sjs1" % coverageScalacPluginVersion.value,
-              OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % ScoveragePluginConfig.name
+              "org.scoverage" %% "scalac-scoverage-runtime_sjs1" % coverageScalacPluginVersion.value,
+              "org.scoverage" %% "scalac-scoverage-plugin" % coverageScalacPluginVersion.value % "scoveragePlugin"
             )
           }
           else Nil