raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #15049 from akka/wip-2.11-build-adjustments-master-patriknw

Browse source 
=pro #15045 Adjust build for Scala 2.11.0 (for validation)
This commit is contained in:
Patrik Nordwall 2014-04-24 13:58:35 +02:00
commit b48a97f9b4
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
project/AkkaBuild.scala
View file

@ -1065,10 +1065,13 @@ object Dependencies {
val karafExam = "org.apache.karaf.tooling.exam" % "org.apache.karaf.tooling.exam.container" % "2.3.1" % "test" // ApacheV2 val karafExam = "org.apache.karaf.tooling.exam" % "org.apache.karaf.tooling.exam.container" % "2.3.1" % "test" // ApacheV2
// mirrored in OSGi sample // mirrored in OSGi sample
val paxExam = "org.ops4j.pax.exam" % "pax-exam-junit4" % "2.6.0" % "test" // ApacheV2 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._ import Compile._
val scalaXmlDepencency = (if (AkkaBuild.requestedScalaVersion.startsWith("2.10")) Nil else Seq(Test.scalaXml))
val actor = Seq(config) val actor = Seq(config)
@ -1078,7 +1081,7 @@ object Dependencies {
val remote = Seq(netty, protobuf, uncommonsMath, Test.junit, Test.scalatest) 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) val cluster = Seq(Test.junit, Test.scalatest)
@ -1086,7 +1089,8 @@ object Dependencies {
val agent = Seq(scalaStm, Test.scalatest, Test.junit) 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) val kernel = Seq(Test.scalatest, Test.junit)