Skip to content

Commit

Permalink
Removed patched scoverage libs, fixed #4
Browse files Browse the repository at this point in the history
  • Loading branch information
viktor-podzigun committed Feb 4, 2021
1 parent b232a28 commit 1d7cee5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 32 deletions.
17 changes: 2 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,9 @@ Sbt auto-plugins with common tasks/utils for Scala Commons modules
```scala
// inside plugins.sbt

addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "1.0.0-SNAPSHOT")
```

Latest `SNAPSHOT` version is published to [Sonatype Repo](https://oss.sonatype.org/content/repositories/snapshots/org/scommons/), just make sure you added
the proper dependency resolver to your `build.sbt` settings:
```scala
resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
```

### How to Build

To build and run all the tests use the following command:
```bash
sbt clean test publishM2 scripted
addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % [version])
```

## Documentation

You can find documentation [here](https://scommons.org/sbt-scommons-plugin)
You can find all documentation [here](https://scommons.org/sbt-scommons-plugin)
16 changes: 0 additions & 16 deletions src/main/scala/scommons/sbtplugin/project/CommonModule.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package scommons.sbtplugin.project

import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
import sbt.Keys._
import sbt._
import scommons.sbtplugin.mecha.MechaProjectBuild
import scoverage.ScoverageKeys._
import scoverage.ScoverageSbtPlugin

trait CommonModule extends ProjectDef with MechaProjectBuild {

Expand Down Expand Up @@ -56,20 +54,6 @@ object CommonModule {
//when run tests with coverage: "sbt clean coverage test it:test coverageReport && sbt coverageAggregate"
coverageMinimum := 80,

//use patched versions by now, to make scoverage work with scalajs-bundler
libraryDependencies ++= {
if (coverageEnabled.value) {
Seq(
Def.setting("org.scommons.patched" %%% "scalac-scoverage-runtime" % "1.4.0-SNAPSHOT").value,
"org.scommons.patched" %% "scalac-scoverage-plugin" % "1.4.0-SNAPSHOT" % ScoverageSbtPlugin.ScoveragePluginConfig.name
)
}
else Nil
},
libraryDependencies ~= (_.map(_.exclude("org.scoverage", "scalac-scoverage-runtime_2.12"))),
libraryDependencies ~= (_.map(_.exclude("org.scoverage", "scalac-scoverage-runtime_sjs0.6_2.12"))),
libraryDependencies ~= (_.map(_.exclude("org.scoverage", "scalac-scoverage-plugin_2.12"))),

resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
)
}
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := sys.env.getOrElse("version", default = "1.0.0-SNAPSHOT").stripPrefix("v")
version in ThisBuild := sys.env.getOrElse("version", default = "0.4.0-SNAPSHOT").stripPrefix("v")

0 comments on commit 1d7cee5

Please sign in to comment.