Skip to content

Commit

Permalink
Update project
Browse files Browse the repository at this point in the history
    * Java Driver 2.8.0 (hoping to remove java driver dependency ASAP)
    * Add Scala 2.9.2 as base version
  • Loading branch information
Brendan W. McAdams committed Jul 2, 2012
1 parent e2ed73f commit 896e3a7
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
39 changes: 34 additions & 5 deletions project/HammersmithBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ object HammersmithBuild extends Build {
lazy val buildSettings = Seq(
organization := "com.mongodb.async",
version := "0.3.0-SNAPSHOT",
scalaVersion := "2.9.1",
crossScalaVersions := Seq("2.9.1", "2.9.0-1")
scalaVersion := "2.9.2",
crossScalaVersions := Seq("2.9.2", "2.9.1", "2.9.0-1")
)

/**
Expand Down Expand Up @@ -45,7 +45,36 @@ object HammersmithBuild extends Build {
*/

lazy val defaultSettings = baseSettings ++ Seq(
libraryDependencies ++= Seq(commonsPool, scalaj_collection, netty, twitterUtilCore, slf4j, specs2),
libraryDependencies ++= Seq(commonsPool, netty, twitterUtilCore, slf4j),
libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
sv match {
case "2.9.2" =>
deps :+ ("org.scalaj" % "scalaj-collection_2.9.1" % "1.2")
case x => {
deps :+ ("org.scalaj" %% "scalaj-collection" % "1.2")
}
}

},
libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
sv match {
case "2.9.2" =>
deps :+ ("org.scala-tools.time" % "time_2.9.1" % "0.5")
case x => {
deps :+ ("org.scala-tools.time" %% "time" % "0.5")
}
}

},
libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
val versionMap = Map("2.8.1" -> ("specs2_2.8.1", "1.5"),
"2.9.0" -> ("specs2_2.9.0", "1.7.1"),
"2.9.0-1" -> ("specs2_2.9.0", "1.7.1"),
"2.9.1" -> ("specs2_2.9.1", "1.7.1"),
"2.9.2" -> ("specs2_2.9.2", "1.10"))
val tuple = versionMap.getOrElse(sv, sys.error("Unsupported Scala version for Specs2"))
deps :+ ("org.specs2" % tuple._1 % tuple._2)
},
resolvers ++= Seq(sonaReleases, jbossRepo, sbtReleases, sbtSnapshots, twttrRepo),
autoCompilerPlugins := true,
parallelExecution in Test := true,
Expand Down Expand Up @@ -95,7 +124,7 @@ object Publish {
object Dependencies {
//BSON
//val bsonJava = "org.mongodb" % "bson" % "2.7.1" // currently broken for just bson
val bsonJava = "org.mongodb" % "mongo-java-driver" % "2.7.3"
val bsonJava = "org.mongodb" % "mongo-java-driver" % "2.8.0"
// Connection Pooling
val commonsPool = "commons-pool" % "commons-pool" % "1.5.5"

Expand All @@ -108,7 +137,7 @@ object Dependencies {

// Testing Deps
val specs2 = "org.specs2" %% "specs2" % "1.7.1" % "provided"
val mongoJava = "org.mongodb" % "mongo-java-driver" % "2.7.3" % "test->default"
val mongoJava = "org.mongodb" % "mongo-java-driver" % "2.8.0" % "test->default"
val slf4j = "org.slf4j" % "slf4j-api" % "1.6.1"
val slf4jJCL = "org.slf4j" % "slf4j-jcl" % "1.6.1" % "test"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolvers += Classpaths.typesafeResolver


addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.0")
//addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.0")

1 comment on commit 896e3a7

@iron9light
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, this project is active again.

Please sign in to comment.