Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scalastyle-sbt-plugin to 1.0.0 #1839

Merged
merged 2 commits into from
Aug 30, 2017
Merged

Update scalastyle-sbt-plugin to 1.0.0 #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24ecdb1
Update scalastyle-sbt-plugin to 1.0.0
fthomas Aug 21, 2017
9806e80
Merge branch 'master' into scalastyle-sbt-plugin-1.0.0
kailuowang Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,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 ++= {
Expand Down
2 changes: 2 additions & 0 deletions kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/main/scala/cats/kernel/Comparison.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/main/scala/cats/kernel/instances/bitSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] =
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.5")
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.8.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
Expand Down