Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #17 from fmpwizard/master

Add scala 2.10.0 as a cross build plus (and some minor changes)
  • Loading branch information...
commit cddccfa4f06875d2a4704eaf6f824efabedd52a2 2 parents fe3f67d + f3421d6
Timothy Perrett authored
2  project/build.properties
... ... @@ -1 +1 @@
1   -sbt.version=0.11.3-2
  1 +sbt.version=0.12.1
4 project/build.scala
@@ -11,7 +11,7 @@ object BuildSettings {
11 11 scalaVersion := buildScalaVersion,
12 12 scalaVersion := "2.9.2",
13 13 scalacOptions += "-deprecation",
14   - crossScalaVersions := Seq("2.9.1", "2.9.2"),
  14 + crossScalaVersions := Seq("2.9.1", "2.9.2", "2.10.0"),
15 15 resolvers ++= Seq(
16 16 ScalaToolsReleases,
17 17 "Shiro Releases" at "https://repository.apache.org/content/repositories/releases/",
@@ -64,7 +64,7 @@ object LiftShiroBuild extends Build {
64 64 lazy val library: Project = Project("lift-shiro", file("library"),
65 65 settings = BuildSettings.buildSettings ++ (
66 66 libraryDependencies ++= Seq(
67   - "net.liftweb" %% "lift-webkit" % "2.5-M3" % "compile",
  67 + "net.liftweb" %% "lift-webkit" % "2.5-M4" % "compile",
68 68 "org.apache.shiro" % "shiro-core" % "1.2.0",
69 69 "org.apache.shiro" % "shiro-web" % "1.2.0",
70 70 "commons-beanutils" % "commons-beanutils" % "20030211.134440"
2  project/plugins.sbt
... ... @@ -1,3 +1,3 @@
1 1 resolvers += "web-plugin.repo" at "http://siasia.github.com/maven2"
2 2
3   -libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.11.1"))
  3 +libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % ("0.12.0-0.2.11.1"))

0 comments on commit cddccfa

Please sign in to comment.
Something went wrong with that request. Please try again.