Skip to content

Commit

Permalink
update to 2.13.0-M4
Browse files Browse the repository at this point in the history
  • Loading branch information
larsrh committed Jun 23, 2018
1 parent f5c145f commit bd09f5f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scala:
- 2.10.7
- 2.11.12
- 2.12.6
- 2.13.0-M3
- 2.13.0-M4
jdk:
- oraclejdk8
script:
Expand Down
20 changes: 6 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.typesafe.sbt.pgp.PgpKeys._
name := "discipline root project"

lazy val commonSettings = Seq(
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M3"),
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4"),
organization := "org.typelevel",
name := "discipline",
scalaVersion := "2.12.6",
Expand All @@ -21,17 +21,9 @@ lazy val commonSettings = Seq(
"-language:implicitConversions"
),
libraryDependencies ++= Seq(
"org.scalacheck" %%% "scalacheck" % "1.13.5"
"org.scalacheck" %%% "scalacheck" % "1.14.0",
"org.scalatest" %%% "scalatest" % "3.0.6-SNAP1" % "optional"
),
libraryDependencies += {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 13)) =>
"org.scalatest" %%% "scalatest" % "3.0.5-M1" % "optional"
case _ =>
"org.scalatest" %%% "scalatest" % "3.0.5" % "optional"
}
},
resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases",
scalacOptions in Test ++= Seq("-Yrangepos"),

releaseProcess := Seq[ReleaseStep](
Expand Down Expand Up @@ -103,9 +95,9 @@ lazy val discipline = crossProject.in(file("."))
specs2Version := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n == 10 =>
"3.9.1"
"3.9.5"
case _ =>
"4.0.3"
"4.3.0"
}
},
libraryDependencies ++= Seq(
Expand All @@ -115,7 +107,7 @@ lazy val discipline = crossProject.in(file("."))
)
.jsSettings(
scalaJSStage in Test := FastOptStage,
specs2Version := "4.0.3",
specs2Version := "4.3.0",
libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n == 10 =>
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23")
2 changes: 1 addition & 1 deletion shared/src/main/scala/specs2/Discipline.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ trait Discipline extends ScalaCheck { self: SpecificationLike =>

def checkAll(name: String, ruleSet: Laws#RuleSet)(implicit p: Parameters) = {
s"""${ruleSet.name} laws must hold for ${name}""" ^ br ^
Fragments.foreach(ruleSet.all.properties) { case (id, prop) =>
Fragments.foreach(ruleSet.all.properties.toList) { case (id, prop) =>
id ! check(prop, p, defaultFreqMapPretty) ^ br
}
}
Expand Down
6 changes: 3 additions & 3 deletions shared/src/main/scala/specs2/mutable/Discipline.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import org.specs2.specification.core.Fragments
trait Discipline extends ScalaCheck { self: SpecificationLike =>

def checkAll(name: String, ruleSet: Laws#RuleSet)(implicit p: Parameters) = {
s"""${ruleSet.name} laws must hold for ${name}""".txt
br
Fragments.foreach(ruleSet.all.properties) { case (id, prop) =>
s"""${ruleSet.name} laws must hold for ${name}""".txt
br
Fragments.foreach(ruleSet.all.properties.toList) { case (id, prop) =>
id in check(prop, p, defaultFreqMapPretty)
}
}
Expand Down

0 comments on commit bd09f5f

Please sign in to comment.