From b267e8d882ef979c0e89d803d316e614ffca0731 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 24 Apr 2014 09:44:15 +0200 Subject: [PATCH] =pro #15045 Adjust build for Scala 2.11.0 * Forward port of 2b891e7 --- project/AkkaBuild.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index d541f97509..a3ba9c8157 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -1066,10 +1066,13 @@ object Dependencies { val karafExam = "org.apache.karaf.tooling.exam" % "org.apache.karaf.tooling.exam.container" % "2.3.1" % "test" // ApacheV2 // mirrored in OSGi sample val paxExam = "org.ops4j.pax.exam" % "pax-exam-junit4" % "2.6.0" % "test" // ApacheV2 + val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.0.1" % "test" } } import Compile._ + + val scalaXmlDepencency = (if (AkkaBuild.requestedScalaVersion.startsWith("2.10")) Nil else Seq(Test.scalaXml)) val actor = Seq(config) @@ -1079,7 +1082,7 @@ object Dependencies { val remote = Seq(netty, protobuf, uncommonsMath, Test.junit, Test.scalatest) - val remoteTests = Seq(Test.junit, Test.scalatest) + val remoteTests = Seq(Test.junit, Test.scalatest) ++ scalaXmlDepencency val cluster = Seq(Test.junit, Test.scalatest) @@ -1087,7 +1090,8 @@ object Dependencies { val agent = Seq(scalaStm, Test.scalatest, Test.junit) - val persistence = Seq(levelDB, levelDBNative, protobuf, Test.scalatest, Test.junit, Test.commonsIo) + val persistence = Seq(levelDB, levelDBNative, protobuf, Test.scalatest, Test.junit, Test.commonsIo) ++ + scalaXmlDepencency val kernel = Seq(Test.scalatest, Test.junit)