Merge pull request #1839 from fthomas/scalastyle-sbt-plugin-1.0.0

Update scalastyle-sbt-plugin to 1.0.0
typelevel · Aug 30, 2017 · 19be2cd · 19be2cd
2 parents 406d984 + 9806e80
commit 19be2cd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -44,8 +44,6 @@ lazy val commonSettings = Seq(
   fork in test := true,
   parallelExecution in Test := false,
   scalacOptions in (Compile, doc) := (scalacOptions in (Compile, doc)).value.filter(_ != "-Xfatal-warnings"),
-  // workaround for https://github.com/scalastyle/scalastyle-sbt-plugin/issues/47
-  scalastyleSources in Compile ++= (unmanagedSourceDirectories in Compile).value,
   ivyConfigurations += config("compile-time").hide,
   unmanagedClasspath in Compile ++= update.value.select(configurationFilter("compile-time")),
   unmanagedSourceDirectories in Test ++= {

diff --git a/kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala b/kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala
@@ -41,6 +41,7 @@ trait OrderLaws[A] extends Laws {
     }
   )
 
+  // scalastyle:off cyclomatic.complexity
   def partialOrder(implicit A: PartialOrder[A]): OrderProperties = new OrderProperties(
     name = "partialOrder",
     parent = Some(eqv),
@@ -84,6 +85,7 @@ trait OrderLaws[A] extends Laws {
       else m ?== None
     }
   )
+  // scalastyle:on cyclomatic.complexity
 
   def order(implicit A: Order[A]): OrderProperties = new OrderProperties(
     name = "order",

diff --git a/kernel/src/main/scala/cats/kernel/Comparison.scala b/kernel/src/main/scala/cats/kernel/Comparison.scala
@@ -16,7 +16,7 @@ object Comparison {
   def fromInt(int: Int): Comparison = {
     if (int > 0)       Comparison.GreaterThan
     else if (int == 0) Comparison.EqualTo
-    else               Comparison.LessThan
+    else               Comparison.LessThan // scalastyle:ignore ensure.single.space.after.token
   }
 
   def fromDouble(double: Double): Option[Comparison] = {

diff --git a/kernel/src/main/scala/cats/kernel/instances/bitSet.scala b/kernel/src/main/scala/cats/kernel/instances/bitSet.scala
@@ -3,7 +3,7 @@ package instances
 
 import scala.collection.immutable.BitSet
 
-package object bitSet extends BitSetInstances
+package object bitSet extends BitSetInstances // scalastyle:ignore package.object.name
 
 trait BitSetInstances {
   implicit val catsKernelStdPartialOrderForBitSet: PartialOrder[BitSet] =

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("com.github.gseitz"   % "sbt-release"           % "1.0.6")
 addSbtPlugin("com.jsuereth"        % "sbt-pgp"               % "1.1.0-M1")
 addSbtPlugin("com.typesafe"        % "sbt-mima-plugin"       % "0.1.17")
 addSbtPlugin("pl.project13.scala"  % "sbt-jmh"               % "0.2.27")
-addSbtPlugin("org.scalastyle"      % "scalastyle-sbt-plugin" % "0.8.0")
+addSbtPlugin("org.scalastyle"      % "scalastyle-sbt-plugin" % "1.0.0")
 addSbtPlugin("org.scoverage"       % "sbt-scoverage"         % "1.5.1")
 addSbtPlugin("com.typesafe.sbt"    % "sbt-git"               % "0.9.3")
 addSbtPlugin("org.scala-js"        % "sbt-scalajs"           % "0.6.19")