Skip to content

Commit

Permalink
Merge pull request #44 from kailuowang/update-cats
Browse files Browse the repository at this point in the history
updated to sbt-catalysts to 0.2.2 / moved to scala 2.12.1
  • Loading branch information
ceedubs authored Jan 24, 2017
2 parents 3c12e63 + 25837c8 commit 8325a6f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions project/AlleycatsDeps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,17 @@ object Dependencies {

// Versions for libraries and packages
// Package -> version
val versions = Map[String, String](
"discipline" -> "0.4.1"
)
val versions = Map[String, String]()

// library definitions and links to their versions
// Note that one version may apply to more than one library.
// Library name -> version key, org, library
val libraries = Map[String, (String, String, String)](
)
val libraries = Map[String, (String, String, String)]()

// compiler plugins definitions and links to their versions
// Note that one version may apply to more than one plugin.
// Library name -> version key, org, librar, crossVersion
val scalacPlugins = Map[String, (String, String, String, CrossVersion)](
)
val scalacPlugins = Map[String, (String, String, String, CrossVersion)]()

// Some helper methods to combine libraries
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.typelevel" % "sbt-catalysts" % "0.1.14")
addSbtPlugin("org.typelevel" % "sbt-catalysts" % "0.2.2")

addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
2 changes: 1 addition & 1 deletion tests/src/test/scala/alleycats/tests/AlleycatsSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ trait TestSettings extends Configuration with Matchers {

lazy val slowCheckConfiguration: PropertyCheckConfiguration =
if (Platform.isJvm) checkConfiguration
else PropertyCheckConfig(maxSize = 1, minSuccessful = 1)
else PropertyCheckConfiguration(sizeRange = 1, minSuccessful = 1)
}

/**
Expand Down

0 comments on commit 8325a6f

Please sign in to comment.