only use major sjs version, changes as per review comments

scoverage · Apr 28, 2021 · 5d298ed · 5d298ed
1 parent e944e6d
commit 5d298ed
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 21 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -15,15 +15,7 @@ jobs:
         java: [ '11' ]
         scala: [
             { version: '2.12.13' },
-            { version: '2.12.12' },
-            { version: '2.12.11' },
-            { version: '2.12.10' },
-            { version: '2.13.5' },
-            { version: '2.13.4' },
-            { version: '2.13.3' },
-            { version: '2.13.2' },
-            { version: '2.13.1' },
-            { version: '2.13.0' }
+            { version: '2.12.10' }
           ]
     steps:
       - name: checkout the repo

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ discussion on scoverage.
 
 Make sure your SBT version in project/build.properties:
 ```
-sbt.version = 1.5.1
+sbt.version = 1.2.8
 ```
 
 Add the plugin in project/plugins.sbt:
@@ -52,7 +52,7 @@ Sample project with scoverage in both sbt and maven - [the scoverage samples pro
 
 ## Notes on upgrading to version 1.6.x
 * ´coverageCleanSubprojectFiles´ key has been removed
-* scala version 2.12+ is required as a minimum
+* scala version 2.12+ is required as a minimum (due to scoverage suppport)
 
 ## Notes on upgrading to version 1.6.0
 

diff --git a/build.sbt b/build.sbt
@@ -9,11 +9,10 @@ releaseProcess := Seq[ReleaseStep](
   inquireVersions,
   runClean,
   releaseStepCommandAndRemaining("^ test"),
-//  releaseStepCommandAndRemaining("^ scripted"),
   setReleaseVersion,
   commitReleaseVersion,
   tagRelease,
-  releaseStepCommandAndRemaining("^ publish"),
+  releaseStepCommandAndRemaining("publishSigned"),
   setNextVersion,
   commitNextVersion,
   pushChanges

diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala
@@ -96,7 +96,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
   private def optionalScalaJsSuffix(deps: Seq[ModuleID]): String = {
     val sjsClassifier = deps.collectFirst {
       case moduleId if moduleId.organization == "org.scala-js" && moduleId.name == "scalajs-library" => moduleId.revision
-    }.map(_.take(3)).map(sjsVersion => "_sjs" + sjsVersion)
+    }.map(_.take(1)).map(sjsVersion => "_sjs" + sjsVersion)
 
     sjsClassifier getOrElse ""
   }

diff --git a/src/sbt-test/scoverage/aggregate-only/project/plugins.sbt b/src/sbt-test/scoverage/aggregate-only/project/plugins.sbt
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
     """|The system property 'plugin.version' is not defined.
        |Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
 
 resolvers ++= {
   if (pluginVersion.endsWith("-SNAPSHOT"))

diff --git a/src/sbt-test/scoverage/aggregate/project/plugins.sbt b/src/sbt-test/scoverage/aggregate/project/plugins.sbt
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
     """|The system property 'plugin.version' is not defined.
        |Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
 
 resolvers ++= {
   if (pluginVersion.endsWith("-SNAPSHOT"))

diff --git a/src/sbt-test/scoverage/bad-coverage/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage/project/plugins.sbt
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
     """|The system property 'plugin.version' is not defined.
        |Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
 
 resolvers ++= {
   if (pluginVersion.endsWith("-SNAPSHOT"))

diff --git a/src/sbt-test/scoverage/coverage-off/project/plugins.sbt b/src/sbt-test/scoverage/coverage-off/project/plugins.sbt
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
     """|The system property 'plugin.version' is not defined.
        |Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
 
 resolvers ++= {
   if (pluginVersion.endsWith("-SNAPSHOT"))

diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt
@@ -28,10 +28,8 @@ resolvers ++= {
   else Seq.empty
 }
 
-// We force coverage to be always disabled for 2.10. This is not an uncommon real world scenario
 coverageEnabled := {
   CrossVersion.partialVersion(scalaVersion.value) match {
-//    case Some((2, 10)) => false
     case _ => coverageEnabled.value
   }
 }
diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt
@@ -8,7 +8,7 @@ lazy val cross = CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatfor
   .settings(
     scalaVersion := "2.12.13",
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % "3.2.8" % "test" cross(CrossVersion.binary)
+      "org.scalatest" %% "scalatest" % "3.2.8" % "test"
     )
   )