Update to sbt 0.10.

.gitignore

@@ -1,5 +1,8 @@
 .idea/
 .gradle/
+.classpath
+.project
+.scala_dependencies
 build/
 out/
 .DS_Store

README.md

@@ -1,7 +1,7 @@
 Running the Sample app
 ======================
 
-1. Install the [Simple Build Tool](http://code.google.com/p/simple-build-tool/wiki/Setup)
+1. Install the [Simple Build Tool](https://github.com/harrah/xsbt/wiki/Setup)
 2. `cd scalasec`
 3. `sbt`
 

build.gradle

@@ -11,10 +11,10 @@ repositories {
 }
 
 dependencies {
-    scalaTools 'org.scala-lang:scala-compiler:2.9.0-1'
-    scalaTools 'org.scala-lang:scala-library:2.9.0-1'
+    scalaTools 'org.scala-lang:scala-compiler:2.9.1'
+    scalaTools 'org.scala-lang:scala-library:2.9.1'
 
-    compile 'org.scala-lang:scala-library:2.9.0-1',
+    compile 'org.scala-lang:scala-library:2.9.1',
             "org.springframework.security:spring-security-core:$springSecVersion",
             "org.springframework.security:spring-security-web:$springSecVersion",
             "org.springframework.security:spring-security-config:$springSecVersion",
@@ -25,6 +25,6 @@ dependencies {
             'ch.qos.logback:logback-classic:0.9.28',
             'cglib:cglib-nodep:2.2.2'
 
-    testCompile 'org.scalatest:scalatest_2.9.0:1.6.1',
+    testCompile 'org.scalatest:scalatest_2.9.1:1.6.1',
                 'org.mockito:mockito-all:1.8.5'
 }

project/ScalasecBuild.scala

@@ -0,0 +1,68 @@
+import sbt._
+import Keys._
+
+import com.github.siasia.WebPlugin._
+
+object BuildSettings {
+  val buildOrganization = "scalasec"
+  val buildVersion      = "0.1-SNAPSHOT"
+  val buildScalaVersion = "2.9.1"
+
+  val buildSettings = Defaults.defaultSettings ++ webSettings ++ Seq (
+    organization := buildOrganization,
+    version      := buildVersion,
+    scalaVersion := buildScalaVersion
+  )
+}
+
+object Resolvers {
+  val mavenLocalRepo = "Local Maven Repository" at "file://"+Path.userHome+"/.m2/repository"
+  val springSnapshotRepo = "Spring Snapshot Repo" at "http://maven.springframework.org/snapshot"
+}
+
+object Dependencies {
+  val springSecurityVersion = "3.1.0.CI-SNAPSHOT"
+  val logbackVersion = "0.9.28"
+  val slf4jVersion   = "1.6.1"
+
+  def springSecurity(name: String) = "org.springframework.security" % "spring-security-%s".format(name) % springSecurityVersion
+
+  val springSecurityCore = springSecurity("core")
+  val springSecurityWeb = springSecurity("web")
+  val springSecurityConfig = springSecurity("config")
+  val springSecurityOpenid = springSecurity("openid")
+
+  val servletapi = "javax.servlet" % "servlet-api" % "2.5"
+
+  val scalaTest  = "org.scalatest" %% "scalatest" % "1.6.1" % "test->default"
+  val specs2     = "org.specs2" %% "specs2" % "1.6.1" % "test"
+  val specs2scalaz  = "org.specs2" %% "specs2-scalaz-core" % "6.0.1" % "test"
+  val mockito    = "org.mockito" % "mockito-all" % "1.8.5" % "test->default"
+
+  val jetty6     = "org.mortbay.jetty" % "jetty" % "6.1.26" % "jetty"
+  val jetty7     = "org.eclipse.jetty" % "jetty-webapp" % "7.5.0.v20110901" % "jetty"
+
+  val slf4j      = "org.slf4j" % "slf4j-api" % slf4jVersion
+  val logback    = "ch.qos.logback" % "logback-classic" % logbackVersion % "runtime->default"
+  val jcl        = "org.slf4j" %  "jcl-over-slf4j" % slf4jVersion % "runtime->default"
+
+  val cglib      = "cglib" % "cglib-nodep" % "2.2.2" % "runtime->default"
+}
+
+object ScalasecBuild extends Build {
+  import Resolvers._
+  import Dependencies._
+  import BuildSettings._
+
+  val springSecDeps = Seq(springSecurityCore, springSecurityWeb, springSecurityConfig, springSecurityOpenid)
+  val testDeps = Seq(scalaTest, specs2, specs2scalaz, mockito)
+  val loggingDeps = Seq(slf4j, jcl, logback)
+
+  lazy val scalasec = Project("scalasec",
+    file("."),
+    settings = buildSettings ++ Seq (
+      resolvers ++= Seq(mavenLocalRepo, springSnapshotRepo),
+      libraryDependencies ++= Seq(testDeps, loggingDeps, springSecDeps, Seq(servletapi, jetty7, cglib)).flatten
+    )
+  )
+}

project/build.properties

@@ -1,8 +1 @@
-#Project properties
-#Thu Jun 16 18:38:02 BST 2011
-project.organization=SpringSource
-project.name=Spring Security Scala
-sbt.version=0.7.5
-project.version=0.1
-build.scala.versions=2.9.0-1
-project.initialize=false
+sbt.version=0.10.1

project/plugins/plugins.sbt

@@ -0,0 +1,11 @@
+resolvers ++= Seq(
+    "Web plugin repo" at "http://siasia.github.com/maven2",
+    "sbt-idea-repo" at "http://mpeltonen.github.com/maven/",
+    "scct-repo" at "http://mtkopone.github.com/scct/maven-repo/"
+    )
+
+libraryDependencies += "com.github.mpeltonen" %% "sbt-idea" % "0.10.0"
+
+libraryDependencies += "reaktor" % "scct-sbt-for-2.9" % "0.1-SNAPSHOT"
+
+libraryDependencies <+= sbtVersion {v => "com.github.siasia" %% "xsbt-web-plugin" % ("0.1.1-"+v)}