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.

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

Add support for 2.13.0-M3 #2203

Merged
merged 5 commits into from Apr 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ git:
scala:
- 2.10.7
- 2.11.12
- 2.13.0-M3
- 2.12.5

matrix:
allow_failures:
# There are known issues in this scala milestone release that prevent the tests to compile.
# But we want to enable the build to facilitate debuging, esp on the community build.
- scala: 2.13.0-M3

jdk:
- oraclejdk8

Expand Down
36 changes: 23 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ lazy val commonSettings = Seq(
Resolver.sonatypeRepo("snapshots")
),
libraryDependencies ++= Seq(
"com.github.mpilquist" %%% "simulacrum" % "0.11.0" % CompileTime,
"org.typelevel" %%% "machinist" % "0.6.2",
"com.github.mpilquist" %%% "simulacrum" % "0.12.0" % CompileTime,
"org.typelevel" %%% "machinist" % "0.6.4",
compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.patch),
compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4")
compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.6")
),
fork in test := true,
parallelExecution in Test := false,
Expand Down Expand Up @@ -102,9 +102,17 @@ lazy val includeGeneratedSrc: Setting[_] = {
lazy val catsSettings = commonSettings ++ publishSettings ++ scoverageSettings ++ javadocSettings

lazy val scalaCheckVersion = "1.13.5"
lazy val scalaTestVersion = "3.0.3"
lazy val disciplineVersion = "0.8"
lazy val catalystsVersion = "0.0.5"
// 2.13.0-M3 workaround
//lazy val scalaTestVersion = "3.0.5"
lazy val disciplineVersion = "0.9.0"
lazy val catalystsVersion = "0.6"

// 2.13.0-M3 workaround
def scalatestVersion(scalaVersion: String): String =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, 13)) => "3.0.5-M1"
case _ => "3.0.5"
}

lazy val disciplineDependencies = Seq(
libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalaCheckVersion,
Expand All @@ -113,8 +121,9 @@ lazy val disciplineDependencies = Seq(
lazy val testingDependencies = Seq(
libraryDependencies += "org.typelevel" %%% "catalysts-platform" % catalystsVersion,
libraryDependencies += "org.typelevel" %%% "catalysts-macros" % catalystsVersion % "test",
libraryDependencies += "org.scalatest" %%% "scalatest" % scalaTestVersion % "test")

// 2.13.0-M3 workaround
// libraryDependencies += "org.scalatest" %%% "scalatest" % scalaTestVersion % "test")
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatestVersion(scalaVersion.value) % "test")

/**
* Remove 2.10 projects from doc generation, as the macros used in the projects
Expand Down Expand Up @@ -335,8 +344,9 @@ lazy val testkit = crossProject.crossType(CrossType.Pure)
.settings(moduleName := "cats-testkit")
.settings(catsSettings)
.settings(disciplineDependencies)
.settings(
libraryDependencies += "org.scalatest" %%% "scalatest" % scalaTestVersion)
// 2.13.0-M3 workaround
//.settings(libraryDependencies += "org.scalatest" %%% "scalatest" % scalaTestVersion)
.settings(libraryDependencies += "org.scalatest" %%% "scalatest" % scalatestVersion(scalaVersion.value))
.jsSettings(commonJsSettings)
.jvmSettings(commonJvmSettings)

Expand Down Expand Up @@ -401,7 +411,7 @@ lazy val bench = project.dependsOn(macrosJVM, coreJVM, freeJVM, lawsJVM)
.settings(commonJvmSettings)
.settings(coverageEnabled := false)
.settings(libraryDependencies ++= Seq(
"org.scalaz" %% "scalaz-core" % "7.2.15"))
"org.scalaz" %% "scalaz-core" % "7.2.20"))
.enablePlugins(JmhPlugin)

// cats-js is JS-only
Expand Down Expand Up @@ -683,7 +693,7 @@ def disableScoverage210Jvm(crossProject: CrossProject) =
lazy val update2_12 = Seq(
scalacOptions -= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => "-Yinline-warnings"
case Some((2, scalaMajor)) if scalaMajor >= 12 => "-Yinline-warnings"
case _ => ""
}
}
Expand All @@ -692,7 +702,7 @@ lazy val update2_12 = Seq(
lazy val xlint = Seq(
scalacOptions += {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => "-Xlint:-unused,_"
case Some((2, scalaMajor)) if scalaMajor >= 12 => "-Xlint:-unused,_"
case _ => "-Xlint"
}
}
Expand Down
7 changes: 4 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0-M3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.0")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.13")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.17")
addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.1")
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.3")
2 changes: 1 addition & 1 deletion project/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.2")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.2")