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

Updates for 2.13.0-RC2 #2857

Merged
merged 5 commits into from
May 25, 2019
Merged

Updates for 2.13.0-RC2 #2857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cdd24b
Updates for 2.13.0-RC2
travisbrown May 24, 2019
2f2a6cb
Update kind-projector and simulacrum for 2.13.0-RC2
travisbrown May 24, 2019
17ef688
Update Machinist for 2.13.0-RC2
travisbrown May 24, 2019
c8bc178
Merge branch 'master' into update/2.13.0-RC2
travisbrown May 24, 2019
f1f34b0
discipline is a milestone release
larsrh May 25, 2019
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: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jdk:

scala_version_211: &scala_version_211 2.11.12
scala_version_212: &scala_version_212 2.12.7
scala_version_213: &scala_version_213 2.13.0-RC1
scala_version_213: &scala_version_213 2.13.0-RC2

before_install:
- export PATH=${PATH}:./vendor/bundle
Expand Down
4 changes: 2 additions & 2 deletions alleycats-tests/shared/src/test/scala/alleycats/tests/AlleycatsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import cats.syntax.{AllSyntax, EqOps}
import cats.tests.StrictCatsEquality
import org.scalatest.Matchers
import org.scalatest.funsuite.AnyFunSuiteLike
import org.scalatest.check.ScalaCheckPropertyChecks
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
import org.typelevel.discipline.scalatest.Discipline
import org.scalacheck.{Arbitrary, Gen}
import org.scalacheck.Arbitrary.arbitrary
Expand All @@ -22,7 +22,7 @@ import scala.util.{Failure, Success, Try}
trait AlleycatsSuite
extends AnyFunSuiteLike
with Matchers
with ScalaCheckPropertyChecks
with ScalaCheckDrivenPropertyChecks
with Discipline
with TestSettings
with AllInstances
Expand Down
24 changes: 14 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ def macroDependencies(scalaVersion: String) =
lazy val catsSettings = Seq(
incOptions := incOptions.value.withLogRecompileOnMacro(false),
libraryDependencies ++= Seq(
"org.typelevel" %%% "machinist" % "0.6.7",
compilerPlugin("org.typelevel" %% "kind-projector" % "0.10.0")
"org.typelevel" %%% "machinist" % "0.6.8",
compilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1")
) ++ macroDependencies(scalaVersion.value),
) ++ commonSettings ++ publishSettings ++ scoverageSettings ++ simulacrumSettings

lazy val simulacrumSettings = Seq(
libraryDependencies += "com.github.mpilquist" %%% "simulacrum" % "0.16.0" % Provided,
libraryDependencies += "com.github.mpilquist" %%% "simulacrum" % "0.17.0" % Provided,
pomPostProcess := { (node: xml.Node) =>
new RuleTransformer(new RewriteRule {
override def transform(node: xml.Node): Seq[xml.Node] = node match {
Expand Down Expand Up @@ -148,23 +148,24 @@ lazy val includeGeneratedSrc: Setting[_] = {
}
}

val scalatestVersion = "3.1.0-SNAP9"
val scalatestVersion = "3.1.0-SNAP11"

val scalatestplusScalaCheckVersion = "1.0.0-SNAP4"
val scalatestplusScalaCheckVersion = "1.0.0-SNAP6"

val scalaCheckVersion = "1.14.0"

val disciplineVersion = "0.11.2-M1"
val disciplineVersion = "0.12.0-M1"

lazy val disciplineDependencies = Seq(
libraryDependencies ++= Seq("org.scalacheck" %%% "scalacheck" % scalaCheckVersion,
"org.typelevel" %%% "discipline" % disciplineVersion)
"org.typelevel" %%% "discipline-core" % disciplineVersion)
)

lazy val testingDependencies = Seq(
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % scalatestVersion % "test",
"org.scalatestplus" %%% "scalatestplus-scalacheck" % scalatestplusScalaCheckVersion % "test"
"org.scalatestplus" %%% "scalatestplus-scalacheck" % scalatestplusScalaCheckVersion % "test",
"org.typelevel" %%% "discipline-scalatest" % disciplineVersion % "test"
)
)

Expand Down Expand Up @@ -561,8 +562,11 @@ lazy val testkit = crossProject(JSPlatform, JVMPlatform)
.settings(catsSettings)
.settings(disciplineDependencies)
.settings(
libraryDependencies ++= Seq("org.scalatest" %%% "scalatest" % scalatestVersion,
"org.scalatestplus" %%% "scalatestplus-scalacheck" % scalatestplusScalaCheckVersion)
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % scalatestVersion,
"org.scalatestplus" %%% "scalatestplus-scalacheck" % scalatestplusScalaCheckVersion,
"org.typelevel" %%% "discipline-scalatest" % disciplineVersion
)
)
.jsSettings(commonJsSettings)
.jvmSettings(commonJvmSettings)
Expand Down
4 changes: 2 additions & 2 deletions testkit/src/main/scala/cats/tests/CatsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import cats.platform.Platform
import cats.syntax._
import org.scalactic.anyvals.{PosInt, PosZDouble, PosZInt}
import org.scalatest.funsuite.AnyFunSuiteLike
import org.scalatest.check.ScalaCheckPropertyChecks
import org.scalatest.Matchers
import org.scalatest.prop.Configuration
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
import org.typelevel.discipline.scalatest.Discipline

trait TestSettings extends Configuration with Matchers {
Expand All @@ -34,7 +34,7 @@ trait TestSettings extends Configuration with Matchers {
trait CatsSuite
extends AnyFunSuiteLike
with Matchers
with ScalaCheckPropertyChecks
with ScalaCheckDrivenPropertyChecks
with Discipline
with TestSettings
with AllInstances
Expand Down