Permalink
Browse files

Back to SBT 0.11.2 for now.

  • Loading branch information...
1 parent f6a9a0d commit 20d163f0a8aff194de0796c086657e0bf34a4a1a @joa committed Apr 18, 2012
Showing with 10 additions and 9 deletions.
  1. +5 −5 project/HectorBuild.scala
  2. +2 −1 project/build.properties
  3. +3 −3 project/plugins.sbt
View
10 project/HectorBuild.scala
@@ -6,13 +6,13 @@ package hector {
import sbt._
import sbt.Keys._
- //import com.github.siasia.WebPlugin.webSettings
+ import com.github.siasia.WebPlugin.webSettings
object HectorBuild extends Build {
lazy val buildSettings = Seq(
organization := "hector",
version := "1.0-SNAPSHOT",
- scalaVersion := "2.10.0-M2"// "2.9.1-1"
+ scalaVersion := "2.9.1-1"//"2.10.0-M2"//
)
// Projects
@@ -27,8 +27,8 @@ package hector {
lazy val web = Project(
id = "hector-web",
base = file("hector-web"),
- settings = defaultSettings ++ Seq( // For now we use the webSettings here too.
- libraryDependencies ++= Dependencies.web // ++ Seq(Dependency.Container.jettyWebapp) // And jettyWebapp as well ...
+ settings = defaultSettings ++ webSettings ++ Seq( // For now we use the webSettings here too.
+ libraryDependencies ++= Dependencies.web ++ Seq(Dependency.Container.jettyWebapp) // And jettyWebapp as well ...
)
)
@@ -118,7 +118,7 @@ package hector {
val akkaActor = "com.typesafe.akka" % "akka-actor" % "2.0" // Apache 2.0
object Container {
- //val jettyWebapp = "org.eclipse.jetty" % "jetty-webapp" % "8.0.4.v20111024" % "container" // Eclipse License
+ val jettyWebapp = "org.eclipse.jetty" % "jetty-webapp" % "8.0.4.v20111024" % "container" // Eclipse License
}
object Provided {
View
3 project/build.properties
@@ -1,2 +1,3 @@
#http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.0-M2/sbt-launch.jar
-sbt.version=0.12.0-M2
+#sbt.version=0.12.0-M2
+sbt.version=0.11.2
View
6 project/plugins.sbt
@@ -2,6 +2,6 @@ resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"
resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
-// Wait for plugins to adapt SBT 0.12
-//addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0", sbtVersion = "0.12.0-M2")
-//libraryDependencies <+= sbtVersion(v ⇒ "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.11"))
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0")
+
+libraryDependencies <+= sbtVersion(v "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.11"))

0 comments on commit 20d163f

Please sign in to comment.