Skip to content

Commit

Permalink
Merge pull request #8 from izhangzhihao/2.1.x
Browse files Browse the repository at this point in the history
Build for Scala 2.13.0-RC2
  • Loading branch information
Atry authored May 24, 2019
2 parents 1b2d7c2 + c8f7c27 commit 401d3f8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
7 changes: 3 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion covariant/.jvm/jvm.sbt
Original file line number Diff line number Diff line change
@@ -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 --= {
Expand Down
8 changes: 4 additions & 4 deletions covariant/build.sbt.shared
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
Expand Down
10 changes: 5 additions & 5 deletions invariant/build.sbt.shared
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 401d3f8

Please sign in to comment.