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

update to CrossVersion.binary deps

Browse source 
- scala-stm_2.10 % 0.7
- scalatest_2.10 % 1.9.1
- scalacheck_2.10 % 1.10.0
This commit is contained in:
Roland 2012-12-22 09:25:31 +01:00
parent b197fc2664
commit f48bdbecf2
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/dev/multi-jvm-testing.rst
View file

@ -72,7 +72,7 @@ Here is an example Build.scala file that uses the MultiJvm plugin:
"test" @crossString@,
"com.typesafe.akka" %% "akka-remote-tests-experimental" % "@version@" %
"test" @crossString@,
"org.scalatest" %% "scalatest" % "1.8" % "test" cross CrossVersion.full,
"org.scalatest" %% "scalatest" % "1.9" % "test",
"junit" % "junit" % "4.5" % "test"
)
}

9
project/AkkaBuild.scala
View file

@ -693,10 +693,10 @@ object Dependencies {
val config = "com.typesafe" % "config" % "1.0.0" // ApacheV2
val netty = "io.netty" % "netty" % "3.5.8.Final" // ApacheV2
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD
val scalaStm = "org.scala-stm" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala)
val scalaStm = "org.scala-stm" %% "scala-stm" % "0.7" // Modified BSD (Scala)
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.2" // MIT
val zeroMQClient = "org.zeromq" % "zeromq-scala-binding_2.10" % "0.0.7" // ApacheV2
val zeroMQClient = "org.zeromq" %% "zeromq-scala-binding" % "0.0.7" // ApacheV2
val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" exclude("jfree", "jcommon") exclude("jfree", "jfreechart") // ApacheV2
val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "0.3.2" // ApacheV2
val osgiCore = "org.osgi" % "org.osgi.core" % "4.2.0" // ApacheV2
@ -716,8 +716,9 @@ object Dependencies {
val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0
val logback = "ch.qos.logback" % "logback-classic" % "1.0.7" % "test" // EPL 1.0 / LGPL 2.1
val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT
val scalatest = "org.scalatest" % "scalatest" % "1.8" % "test" cross CrossVersion.full // ApacheV2
val scalacheck = "org.scalacheck" % "scalacheck" % "1.10.0" % "test" cross CrossVersion.full // New BSD
// changing the scalatest dependency must be reflected in akka-docs/rst/dev/multi-jvm-testing.rst
val scalatest = "org.scalatest" %% "scalatest" % "1.9.1" % "test" // ApacheV2
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" // New BSD
val ariesProxy = "org.apache.aries.proxy" % "org.apache.aries.proxy.impl" % "0.3" % "test" // ApacheV2
val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.1.4" % "test" // ApacheV2
val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "1.0.0" % "test" // ApacheV2