Permalink
Browse files

Update to Scala 2.10RC5

  • Loading branch information...
1 parent 8af1340 commit 7b872c3eec7c0bbc1ebb33521cd9dc143da3c16e @bblfish bblfish committed Dec 15, 2012
View
@@ -5,4 +5,4 @@ before_install:
- sudo dpkg -i /tmp/sbt.deb
language: scala
scala:
- - 2.10.0-RC1
+ - 2.10.0-RC5
@@ -13,6 +13,8 @@ object JenaUtil {
def visitBlank(r: Resource, id: AnonId) = makeBNodeLabel(id.getLabelString)
// go from the model's Node to the Graph one, then cast it (always safe here)
def visitLiteral(l: JenaLiteral) = foldLiteral(l.asNode.asInstanceOf[Jena#Literal])(x => x, x => x)
+
+ override
def visitURI(r: Resource, uri: String) = makeUri(uri)
}
@@ -5,6 +5,7 @@ import com.hp.hpl.jena.sparql.core._
import Jena._
import com.hp.hpl.jena.tdb.{ TDB, TDBFactory }
import JenaOperations._
+import concurrent.Future
abstract class JenaGraphStoreTest(jenaStore: JenaStore) extends GraphStoreTest[Jena](jenaStore) {
@@ -13,11 +14,11 @@ abstract class JenaGraphStoreTest(jenaStore: JenaStore) extends GraphStoreTest[J
}
"adding a named graph should not pollute the default graph" in {
- val s = jenaStore.execute {
- Command.append[Jena](makeUri("http://example.com/foo"), graphToIterable(graph))
+ val s: Future[Unit] = jenaStore.execute {
+ Command.append[Jena]( makeUri("http://example.com/foo"), graphToIterable(graph))
}
s.getOrFail()
- defaultGraph.jenaGraph must have size(0)
+ assert( defaultGraph.jenaGraph.size == 0)
}
}
@@ -11,7 +11,7 @@ class PlantainLDPSTest extends LDPSTest[Plantain]({
PlantainLDPS(null, null)
})
-class LDPSTest[Rdf <: RDF](
+abstract class LDPSTest[Rdf <: RDF](
ldps: LDPS[Rdf])(
implicit diesel: Diesel[Rdf],
reader: RDFReader[Rdf, RDFXML]) extends WordSpec with MustMatchers with BeforeAndAfterAll {
View
@@ -13,7 +13,8 @@ object BuildSettings {
organization := "org.w3",
// version := "0.3-SNAPSHOT",
version := "x14-SNAPSHOT",
- scalaVersion := "2.10.0-RC1",
+ scalaVersion := "2.10.0-RC5",
+ javacOptions ++= Seq("-source","1.7", "-target","1.7"),
parallelExecution in Test := false,
testOptions in Test += Tests.Argument("""stdout(config="durations")"""),
@@ -76,21 +77,21 @@ object BananaRdfBuild extends Build {
// import com.typesafe.sbteclipse.plugin.EclipsePlugin._
- val scalaActors = "org.scala-lang" % "scala-actors" % "2.10.0-RC1"
+ val scalaActors = "org.scala-lang" % "scala-actors" % "2.10.0-RC5"
val scalaIoCore = "com.github.scala-incubator.io" % "scala-io-core_2.10.0-RC1" % "0.4.1"
val scalaIoFile = "com.github.scala-incubator.io" % "scala-io-file_2.10.0-RC1" % "0.4.1"
- val akka = "com.typesafe.akka" % "akka-actor_2.10.0-RC1" % "2.1.0-RC1"
+ val akka = "com.typesafe.akka" % "akka-actor_2.10.0-RC5" % "2.1.0-RC6"
- val akkaTransactor = "com.typesafe.akka" % "akka-transactor_2.10.0-RC1" % "2.1.0-RC1"
+ val akkaTransactor = "com.typesafe.akka" % "akka-transactor_2.10.0-RC5" % "2.1.0-RC6"
- val scalaStm = "org.scala-tools" % "scala-stm_2.10.0-RC1" % "0.6"
+ val scalaStm = "org.scala-tools" % "scala-stm_2.10.0-RC5" % "0.6"
val asyncHttpClient = "com.ning" % "async-http-client" % "1.8.0-SNAPSHOT"
// val scalaz = "org.scalaz" % "scalaz-core_2.10.0-M7" % "7.0.0-M3" from "http://jay.w3.org/~bertails/jar/scalaz-core_2.10.0-M7-7.0.0-M3.jar"
- val scalaz = "org.scalaz" % "scalaz-core_2.10.0-M7" % "7.0.0-M3" // from "http://repo.typesafe.com/typesafe/releases/org/scalaz/scalaz-core_2.10.0-M6/7.0.0-M2/scalaz-core_2.10.0-M6-7.0.0-M2.jar"
+ val scalaz = "org.scalaz" % "scalaz-core_2.10.0-RC5" % "7.0.0-M6" // from "http://repo.typesafe.com/typesafe/releases/org/scalaz/scalaz-core_2.10.0-M6/7.0.0-M2/scalaz-core_2.10.0-M6-7.0.0-M2.jar"
val jodaTime = "joda-time" % "joda-time" % "2.1"
val jodaConvert = "org.joda" % "joda-convert" % "1.2"
@@ -99,7 +100,7 @@ object BananaRdfBuild extends Build {
libraryDependencies += jodaTime % "provided",
libraryDependencies += jodaConvert % "provided")
- val scalatest = "org.scalatest" % "scalatest_2.10.0-RC1" % "2.0.M4-2.10.0-RC1-B1"
+ val scalatest = "org.scalatest" % "scalatest_2.10.0-RC5" % "2.0.M5-B1"
val testsuiteDeps =
Seq(
View
@@ -4,5 +4,5 @@ addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.5.1")
resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/"
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0-SNAPSHOT")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.3.0-SNAPSHOT")

0 comments on commit 7b872c3

Please sign in to comment.