Permalink
Browse files

Merge branch 'develop_2.10' of github.com:/scalatra/scalatra into dev…

…elop_2.10

Conflicts:
	crosspaths.sbt
	project/build.scala
  • Loading branch information...
rossabaker committed Jan 15, 2013
2 parents 5ca96b1 + 5bc7911 commit 3ac6d31f06d55c70ff2e2335153baf94ff62c6b4
Showing with 3 additions and 4 deletions.
  1. +1 −1 crosspaths.sbt
  2. +2 −3 project/build.scala
View
@@ -1 +1 @@
-crossPaths in ThisBuild := false
+crossPaths in ThisBuild := true
View
@@ -13,14 +13,13 @@ object ScalatraBuild extends Build {
organization := "org.scalatra",
crossScalaVersions := Seq("2.10.0"),
scalaVersion <<= (crossScalaVersions) { versions => versions.head },
- scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8"),
+ scalacOptions ++= Seq("-unchecked", "-deprecation", "-Yinline-warnings", "-Xcheckinit", "-encoding", "utf8", "-feature"),
javacOptions ++= Seq("-target", "1.6", "-source", "1.6", "-Xlint:deprecation"),
manifestSetting,
publishSetting,
- crossPaths := true,
resolvers ++= Seq(sonatypeNexusSnapshots),
(LsKeys.tags in LsKeys.lsync) := Seq("web", "sinatra", "scalatra"),
- (LsKeys.docsUrl in LsKeys.lsync) <<= (version){ v =>
+ (LsKeys.docsUrl in LsKeys.lsync) <<= (version) { v =>
val majorVersion = v.split(".").dropRight(1).mkString(".")
Some(new URL("http://www.scalatra.org/%s/book/" format majorVersion))
}

0 comments on commit 3ac6d31

Please sign in to comment.