Skip to content

Commit

Permalink
Merge pull request #139 from Kevin-Lee/upgrade-sbt-devoops
Browse files Browse the repository at this point in the history
Upgraded - sbt-devoops 1.0.2 => 1.0.3
  • Loading branch information
kevin-lee committed Dec 16, 2019
2 parents d3eb5f5 + f7afaf0 commit 5c07fc9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ProjectInfo._
import kevinlee.sbt.SbtCommon.crossVersionProps
import kevinlee.semver.{Major, Minor, SemanticVersion}
import just.semver.SemVer
import SemVer.{Major, Minor}

val ProjectScalaVersion: String = "2.13.1"
val CrossScalaVersions: Seq[String] = Seq("2.10.7", "2.11.12", "2.12.10", ProjectScalaVersion)
Expand Down Expand Up @@ -47,7 +48,7 @@ lazy val justFp = (project in file("."))
)
, addCompilerPlugin("org.typelevel" % "kind-projector" % "0.11.0" cross CrossVersion.full)
, libraryDependencies :=
crossVersionProps(hedgehogLibs, SemanticVersion.parseUnsafe(scalaVersion.value)) {
crossVersionProps(hedgehogLibs, SemVer.parseUnsafe(scalaVersion.value)) {
case (Major(2), Minor(10)) =>
libraryDependencies.value.filterNot(m => m.organization == "org.wartremover" && m.name == "wartremover")
case x =>
Expand Down
2 changes: 1 addition & 1 deletion project/ProjectInfo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object ProjectInfo {
case "2.10" =>
Seq.empty
case _ =>
Warts.allBut(Wart.DefaultArguments, Wart.Overloading, Wart.Any, Wart.Nothing, Wart.NonUnitStatements)
Warts.allBut(Wart.DefaultArguments, Wart.Overloading, Wart.Any, Wart.Nothing, Wart.NonUnitStatements)
}

}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")

addSbtPlugin("io.kevinlee" % "sbt-devoops" % "1.0.2")
addSbtPlugin("io.kevinlee" % "sbt-devoops" % "1.0.3")

0 comments on commit 5c07fc9

Please sign in to comment.