From c8f7c2749af9af8b2bf41120987067f59d5b69b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BF=97=E8=B1=AA?= Date: Fri, 24 May 2019 21:12:34 +0800 Subject: [PATCH] Build for Scala 2.13.0-RC2 --- build.sbt | 7 +++---- covariant/.jvm/jvm.sbt | 2 +- covariant/build.sbt.shared | 8 ++++---- invariant/build.sbt.shared | 10 +++++----- project/plugins.sbt | 6 +++--- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index 9aa62dd..ca00735 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import scala.util.matching.Regex.{Groups, Match} -crossScalaVersions in ThisBuild := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4") +crossScalaVersions in ThisBuild := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-RC2") val CovariantRegex = """extends TryTInstances0|covariant|\+\s*([A_])\b""".r @@ -48,9 +48,8 @@ organization in ThisBuild := "com.thoughtworks.tryt" publishArtifact := false lazy val unidoc = project - .enablePlugins(StandaloneUnidoc, TravisUnidocTitle) + .enablePlugins(ScalaUnidocPlugin) .settings( - unidocProjectFilter in ScalaUnidoc in BaseUnidocPlugin.autoImport.unidoc := inProjects(invariantJVM, covariantJVM), - addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.7"), + addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1"), scalacOptions += "-Xexperimental" ) diff --git a/covariant/.jvm/jvm.sbt b/covariant/.jvm/jvm.sbt index 1a0a56f..9355fcc 100644 --- a/covariant/.jvm/jvm.sbt +++ b/covariant/.jvm/jvm.sbt @@ -1,4 +1,4 @@ -libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.26" % Test +libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.27" % Test // Skip tests in Scala 2.13 for now due to https://github.com/scala/bug/issues/11068 unmanagedSourceDirectories in Test --= { diff --git a/covariant/build.sbt.shared b/covariant/build.sbt.shared index 240ea21..74940d4 100644 --- a/covariant/build.sbt.shared +++ b/covariant/build.sbt.shared @@ -3,13 +3,13 @@ enablePlugins(Example) import scala.meta._ exampleSuperTypes += ctor"_root_.org.scalatest.Inside" -libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.26" +libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.27" -libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.26" +libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.27" -libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP2" % Test +libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % Test -addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.7") +addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1") sourceGenerators in Test := { (sourceGenerators in Test).value.filterNot { sourceGenerator => diff --git a/invariant/build.sbt.shared b/invariant/build.sbt.shared index 32c9dc7..6dcb7bc 100644 --- a/invariant/build.sbt.shared +++ b/invariant/build.sbt.shared @@ -3,15 +3,15 @@ enablePlugins(Example) import scala.meta._ exampleSuperTypes += ctor"_root_.org.scalatest.Inside" -libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.26" +libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.27" -libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.26" +libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.27" -libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP2" % Test +libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % Test -libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.26" % Test +libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.27" % Test -addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.7") +addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1") sourceGenerators in Test := { (sourceGenerators in Test).value.filterNot { sourceGenerator => diff --git a/project/plugins.sbt b/project/plugins.sbt index 96e5a65..ad390b9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,9 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "4.0.2") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") -addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "latest.release") +addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28") addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.0")