Skip to content

Commit 5d298ed

Browse files
committed
only use major sjs version, changes as per review comments
1 parent e944e6d commit 5d298ed

File tree

10 files changed

+10
-21
lines changed

10 files changed

+10
-21
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@ jobs:
1515
java: [ '11' ]
1616
scala: [
1717
{ version: '2.12.13' },
18-
{ version: '2.12.12' },
19-
{ version: '2.12.11' },
20-
{ version: '2.12.10' },
21-
{ version: '2.13.5' },
22-
{ version: '2.13.4' },
23-
{ version: '2.13.3' },
24-
{ version: '2.13.2' },
25-
{ version: '2.13.1' },
26-
{ version: '2.13.0' }
18+
{ version: '2.12.10' }
2719
]
2820
steps:
2921
- name: checkout the repo

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ discussion on scoverage.
1515

1616
Make sure your SBT version in project/build.properties:
1717
```
18-
sbt.version = 1.5.1
18+
sbt.version = 1.2.8
1919
```
2020

2121
Add the plugin in project/plugins.sbt:
@@ -52,7 +52,7 @@ Sample project with scoverage in both sbt and maven - [the scoverage samples pro
5252

5353
## Notes on upgrading to version 1.6.x
5454
* ´coverageCleanSubprojectFiles´ key has been removed
55-
* scala version 2.12+ is required as a minimum
55+
* scala version 2.12+ is required as a minimum (due to scoverage suppport)
5656

5757
## Notes on upgrading to version 1.6.0
5858

build.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ releaseProcess := Seq[ReleaseStep](
99
inquireVersions,
1010
runClean,
1111
releaseStepCommandAndRemaining("^ test"),
12-
// releaseStepCommandAndRemaining("^ scripted"),
1312
setReleaseVersion,
1413
commitReleaseVersion,
1514
tagRelease,
16-
releaseStepCommandAndRemaining("^ publish"),
15+
releaseStepCommandAndRemaining("publishSigned"),
1716
setNextVersion,
1817
commitNextVersion,
1918
pushChanges

src/main/scala/scoverage/ScoverageSbtPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
9696
private def optionalScalaJsSuffix(deps: Seq[ModuleID]): String = {
9797
val sjsClassifier = deps.collectFirst {
9898
case moduleId if moduleId.organization == "org.scala-js" && moduleId.name == "scalajs-library" => moduleId.revision
99-
}.map(_.take(3)).map(sjsVersion => "_sjs" + sjsVersion)
99+
}.map(_.take(1)).map(sjsVersion => "_sjs" + sjsVersion)
100100

101101
sjsClassifier getOrElse ""
102102
}

src/sbt-test/scoverage/aggregate-only/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/aggregate/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/bad-coverage/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/coverage-off/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion withCrossVersion(CrossVersion.full))
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/preserve-set/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ resolvers ++= {
2828
else Seq.empty
2929
}
3030

31-
// We force coverage to be always disabled for 2.10. This is not an uncommon real world scenario
3231
coverageEnabled := {
3332
CrossVersion.partialVersion(scalaVersion.value) match {
34-
// case Some((2, 10)) => false
3533
case _ => coverageEnabled.value
3634
}
3735
}

src/sbt-test/scoverage/scalajs/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lazy val cross = CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatfor
88
.settings(
99
scalaVersion := "2.12.13",
1010
libraryDependencies ++= Seq(
11-
"org.scalatest" %% "scalatest" % "3.2.8" % "test" cross(CrossVersion.binary)
11+
"org.scalatest" %% "scalatest" % "3.2.8" % "test"
1212
)
1313
)
1414

0 commit comments

Comments
 (0)