Permalink
Browse files

Update most deps required for Play 2.1-RC2 and Scala 2.10

Note this does not actually pass tests, and  no
"org.mongodb" %% "casbah-core" % "2.5.0" yet - but it's coming:

https://groups.google.com/d/topic/mongodb-casbah-users/Tiy9r2SMPcQ/discussion
  • Loading branch information...
1 parent 9c6cd50 commit a213af6eee401e64a0be916e83643c5271d63125 @rtyley rtyley committed Jan 17, 2013
View
@@ -1,6 +1,6 @@
import java.util.jar._
-crossScalaVersions in ThisBuild := Seq("2.9.1")
+scalaVersion in ThisBuild := "2.10.0"
// doing "in ThisBuild" makes this default setting for all projects in this build
version in ThisBuild := "5.22-SNAPSHOT"
@@ -2,9 +2,9 @@ resolvers ++= Seq(Classpaths.typesafeResolver, ScalaToolsReleases)
libraryDependencies ++= Seq(
"org.specs2" %% "specs2" % "1.5" % "test",
- "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.0",
- "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.0"
+ "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.1",
+ "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.1"
)
// disable publishing the main javadoc jar
-publishArtifact in (Compile, packageDoc) := false
+publishArtifact in (Compile, packageDoc) := false
@@ -3,7 +3,7 @@ resolvers ++= Seq(Classpaths.typesafeResolver, ScalaToolsReleases)
libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "0.9.27",
"org.mongodb" % "mongo-java-driver" % "2.7.3",
- "org.mongodb" %% "casbah-core" % "2.4.1"
+ "org.mongodb" % "casbah-core_2.9.2" % "2.4.1"
)
// disable publishing the main javadoc jar
View
@@ -1,13 +1,19 @@
libraryDependencies ++= Seq(
- "play" %% "play" % "2.0.1",
+ "play" %% "play" % "2.1-RC2",
+ "org.reflections" % "reflections" % "0.9.8",
"org.specs2" %% "specs2" % "1.5" % "test",
- "play" %% "play-test" % "2.0" % "test"
+ "play" %% "play-test" % "2.1-RC2" % "test"
)
// needed for Play
resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/"
+// sad situation https://github.com/jesseeichar/scala-io/issues/77#issuecomment-11991815
+moduleConfigurations += ModuleConfiguration("com.github.scala-incubator.io", DefaultMavenRepository)
+
+moduleConfigurations += ModuleConfiguration("com.jsuereth", DefaultMavenRepository)
+
// disable publishing the main javadoc jar
publishArtifact in (Compile, packageDoc) := false
@@ -1,9 +1,11 @@
libraryDependencies ++= Seq(
"javax.servlet" % "servlet-api" % "2.4" % "provided",
- "org.specs2" %% "specs2" % "1.5" % "test",
- "org.scalatest" %% "scalatest" % "1.8" % "test",
- "net.liftweb" %% "lift-testkit" % "2.4" % "test"
+ "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.1",
+ "org.specs2" %% "specs2" % "1.13" % "test",
+ "org.scalatest" %% "scalatest" % "1.9.1" % "test",
+ "org.mockito" % "mockito-core" % "1.9.5" % "test",
+ "net.liftweb" %% "lift-testkit" % "2.5-M4" % "test"
)
// needed for specs2
View
@@ -1,19 +1,11 @@
libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-api" % "1.6.1",
- "net.liftweb" %% "lift-json" % "2.4",
- "org.specs2" %% "specs2" % "1.5" % "test",
- "net.liftweb" %% "lift-testkit" % "2.4" % "test"
+ "net.liftweb" %% "lift-json" % "2.5-M4",
+ "org.specs2" %% "specs2" % "1.13" % "test",
+ "net.liftweb" %% "lift-testkit" % "2.5-M4" % "test"
)
-libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
- deps :+ ( sv match {
- case "2.8.1" => "com.github.scala-incubator.io" %% "core" % "0.1.1"
- case "2.9.0-1" => "com.github.scala-incubator.io" %% "core" % "0.1.2"
- case "2.9.1" => "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.0"
- } )
-}
-
// needed for specs2
resolvers += ScalaToolsSnapshots
@@ -22,4 +14,4 @@ resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/
// disable publishing the main javadoc jar
publishArtifact in (Compile, packageDoc) := false
-seq(scalariformSettings: _*)
+seq(scalariformSettings: _*)
@@ -22,7 +22,7 @@ object JvmMetrics {
)
)
} catch {
- case e =>
+ case e: Exception =>
logger.debug("Failed to initialise active threads metric")
None
}
@@ -40,7 +40,7 @@ object JvmMetrics {
)
)
} catch {
- case e =>
+ case e: Exception =>
logger.debug("Failed to initialise total threads metric")
None
}
@@ -59,7 +59,7 @@ object JvmMetrics {
}
}
} catch {
- case e =>
+ case e: Exception =>
logger.trace("Failed to initialise gc metrics", e)
Nil
}
@@ -1,5 +1,4 @@
import com.typesafe.sbtscalariform.ScalariformPlugin
-import org.sbtidea.SbtIdeaPlugin._
import sbt._
import sbt.Keys._
import sbt.PlayProject._
@@ -21,7 +20,7 @@ object ManagementBuild extends Build {
managementMongo,
exampleServletApi,
examplePlay
- ).settings(ideaSettings: _*).noPublish
+ ).noPublish
lazy val management = managementProject("management")
@@ -37,15 +36,13 @@ object ManagementBuild extends Build {
managementLogback
).noPublish
- lazy val examplePlay = PlayProject(
+ lazy val examplePlay = play.Project(
name = "example-play",
applicationVersion = "1.0",
dependencies = Nil,
- path = file("example-play"),
- mainLang = SCALA).
- settings(ideaSettings: _*).
+ path = file("example-play")).
dependsOn(management, managementPlay, managementLogback).
noPublish
- def managementProject(name: String) = Project(name, file(name)).settings(ideaSettings: _*).settings(ScalariformPlugin.scalariformSettings :_*)
+ def managementProject(name: String) = Project(name, file(name)).settings(ScalariformPlugin.scalariformSettings :_*)
}
View
@@ -1 +1,2 @@
-sbt.version=0.11.3
+sbt.version=0.12.2
+
View
@@ -4,9 +4,8 @@ resolvers ++= Seq(
"Web plugin repo" at "http://siasia.github.com/maven2"
)
-addSbtPlugin("play" % "sbt-plugin" % "2.0.3")
-
+addSbtPlugin("play" % "sbt-plugin" % "2.1-RC2")
addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.4.0")
-libraryDependencies += "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11"
+libraryDependencies += "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
View
Binary file not shown.
View
Binary file not shown.

0 comments on commit a213af6

Please sign in to comment.