aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorTravis Brown <tbrown@twitter.com>2014-12-16 00:01:03 +0000
committerChristopher Vogt <oss.nsp@cvogt.org>2016-11-07 02:08:39 -0500
commit623cfdd2a0b26ef2d1e0a78025b950f2958b67b7 (patch)
tree5f05d985c154cb3d0ba8e2f00aece3f0c558b119 /libraries
parent28a6f3c76ff38437daacc5c5ae4f5136c143637d (diff)
downloadcbt-623cfdd2a0b26ef2d1e0a78025b950f2958b67b7.tar.gz
cbt-623cfdd2a0b26ef2d1e0a78025b950f2958b67b7.tar.bz2
cbt-623cfdd2a0b26ef2d1e0a78025b950f2958b67b7.zip
Enable Scala 2.11 SBT builds for util-eval, ostrich, and finagle-ostrich4
Problem We want to publish 2.11 releases of Finagle subprojects that depend on Ostrich, which we have not previously built for 2.11 (because it has specs tests, and because it depends on scala-json and util-eval, neither of which previously worked on 2.11). Solution util-eval previously didn't work on 2.11 because `scala.ScalaObject` has been removed since 2.10. This is fixed here. The bulk of this commit is Rodrigo Lazoti's migration of Ostrich's tests from specs to ScalaTest (I'm not using his pull request since the PR also replaces scala-json with Jackson, which we don't want to do at this time to avoid breaking public APIs). This commit also reinstates util-eval and the Finagle subprojects that depend on Ostrich in their projects' cross-builds. Result util-eval, ostrich, finagle-ostrich4, finagle-example, and finagle-stress all build and pass tests on 2.11 (from SBT) for the first time. RB_ID=534127
Diffstat (limited to 'libraries')
-rw-r--r--libraries/eval/Eval.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala
index e46fa6e..e9c95fd 100644
--- a/libraries/eval/Eval.scala
+++ b/libraries/eval/Eval.scala
@@ -80,7 +80,7 @@ class Eval(target: Option[File]) {
}
private lazy val libPath = try {
- classPathOfClass("scala.ScalaObject")
+ classPathOfClass("scala.AnyVal")
} catch {
case e: Throwable =>
throw new RuntimeException("Unable to load scala base object from classpath (scala-library jar is missing?)", e)