Permalink
Browse files

Update Scala versions to 2.11.8 + 2.12.0-M5

Some scaladoc links are incompatible between 2.11 and 2.12:
https://issues.scala-lang.org/browse/SI-9842

I’m disabling scaladoc link checking on 2.12 for now. The manual should
be published with scaladocs built by 2.11 until this is fixed (or we
switch over to the new 2.12 scaladoc)
  • Loading branch information...
1 parent 62f01f3 commit b33d506e50498f75a510b547f445227498ccd68b @szeiger szeiger committed Jul 4, 2016
Showing with 19 additions and 13 deletions.
  1. +19 −13 project/Build.scala
View
@@ -14,7 +14,7 @@ object SlickBuild extends Build {
val slickVersion = "3.2.0-SNAPSHOT"
val binaryCompatSlickVersion = "3.2.0" // Slick base version for binary compatibility checks
- val scalaVersions = Seq("2.11.7", "2.12.0-M2")
+ val scalaVersions = Seq("2.11.8", "2.12.0-M5")
/** Dependencies for reuse in different parts of the build */
object Dependencies {
@@ -23,7 +23,7 @@ object SlickBuild extends Build {
"com.novocode" % "junit-interface" % "0.11"
)
def scalaTestFor(scalaVersion: String) = {
- val v = if(scalaVersion == "2.12.0-M2") "2.2.5-M2" else "2.2.4"
+ val v = "3.0.0-RC4"
"org.scalatest" %% "scalatest" % v
}
val slf4j = "org.slf4j" % "slf4j-api" % "1.7.18"
@@ -161,17 +161,23 @@ object SlickBuild extends Build {
}
/* A command that runs all tests sequentially */
- def testAll = Command.command("testAll")(runTasksSequentially(List(
- test in (slickTestkitProject, Test),
- test in (slickTestkitProject, DocTest),
- test in (osgiTestProject, Test),
- test in (reactiveStreamsTestProject, Test),
- packageDoc in Compile in slickProject,
- packageDoc in Compile in slickCodegenProject,
- packageDoc in Compile in slickHikariCPProject,
- packageDoc in Compile in slickTestkitProject,
- sdlc in aRootProject
- )))
+ def testAll = Command.command("testAll") { state =>
+ val extracted = Project.extract(state)
+ val tasks = List(
+ test in (slickTestkitProject, Test),
+ test in (slickTestkitProject, DocTest),
+ test in (osgiTestProject, Test),
+ test in (reactiveStreamsTestProject, Test),
+ packageDoc in Compile in slickProject,
+ packageDoc in Compile in slickCodegenProject,
+ packageDoc in Compile in slickHikariCPProject,
+ packageDoc in Compile in slickTestkitProject
+ )
+ val withSdlc =
+ if(extracted.get(scalaVersion).startsWith("2.11.")) tasks :+ (sdlc in aRootProject)
+ else tasks
+ runTasksSequentially(withSdlc)(state)
+ }
/* Project Definitions */
lazy val aRootProject: Project = Project(id = "root", base = file("."),

0 comments on commit b33d506

Please sign in to comment.