Permalink
Browse files

Name now includes Lift Edition.

  • Loading branch information...
d6y committed Apr 7, 2013
1 parent 1a207e7 commit b7a9d60b3c4a11a6e50a1e45ec9b945d9d36bece
Showing with 29 additions and 22 deletions.
  1. +11 −3 README.md
  2. +14 −14 build.sbt
  3. +4 −5 project/LiftModule.scala
View
@@ -3,17 +3,25 @@ Scalate Lift Module
This module provides integration with Scalate.
----
+To include this module in your Lift project, update your `libraryDependencies` in `build.sbt` to include:
-See...
+*Lift 2.5.x* for Scala 2.9 and 2.10:
+
+ "net.liftmodules" %% "scalate_2.5" % "1.3"
+
+*Lift 3.0.x* for Scala 2.10:
+
+ "net.liftmodules" %% "scalate_3.0" % "1.3-SNAPSHOT"
+
+Documentation
+=============
* [Using Scalate with Lift](http://scalate.fusesource.org/documentation/lift.html).
* [Example project using Scalate](https://github.com/lift/lift/tree/master/examples/helloscalate).
**Note:** The module package changed from `net.liftweb.scalate` to `net.liftmodules.scalate` in May 2012. Please consider this when referencing documentation written before that date.
----
Notes for module developers
===========================
View
@@ -2,36 +2,36 @@ name := "scalate"
organization := "net.liftmodules"
+version := "1.3-SNAPSHOT"
+
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.3-SNAPSHOT" }
-
scalaVersion := "2.10.0"
-
+
scalacOptions ++= Seq("-unchecked", "-deprecation")
-
+
crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
resolvers += "CB Central Mirror" at "http://repo.cloudbees.com/content/groups/public"
resolvers += "Java.net Maven2 Repository" at "http://download.java.net/maven/2/"
libraryDependencies <++= liftVersion { v =>
- "net.liftweb" %% "lift-webkit" % v % "compile->default" ::
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
Nil
-}
+}
-libraryDependencies <++= scalaVersion { sv =>
+libraryDependencies <++= scalaVersion { sv =>
"javax.servlet" % "servlet-api" % "2.5" % "provided" ::
- (sv match {
+ (sv match {
case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
- }) ::
- (sv match {
+ }) ::
+ (sv match {
case "2.10.0" => "org.fusesource.scalate" %% "scalate-core" % "1.6.1"
case _ => "org.fusesource.scalate" % "scalate-core" % "1.5.3"
}) ::
- (sv match {
+ (sv match {
case "2.10.0" => "org.fusesource.scalamd" %% "scalamd" % "1.6"
case _ => "org.fusesource.scalamd" % "scalamd" % "1.5"
}) ::
@@ -43,7 +43,7 @@ publishTo <<= version { _.endsWith("SNAPSHOT") match {
case true => Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
case false => Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
}
- }
+ }
// For local deployment:
@@ -80,6 +80,6 @@ pomExtra := (
<name>Lift Team</name>
<url>http://www.liftmodules.net</url>
</developer>
- </developers>
+ </developers>
)
-
+
View
@@ -3,11 +3,10 @@ import sbt.Keys._
object LiftModuleBuild extends Build {
-val liftVersion = SettingKey[String]("liftVersion", "Version number of the Lift Web Framework")
-
-val project = Project("LiftModule", file("."))
-
-}
+ val liftVersion = SettingKey[String]("liftVersion", "Full version number of the Lift Web Framework")
+ val liftEdition = SettingKey[String]("liftEdition", "Lift Edition (short version number to append to artifact name)")
+ val project = Project("LiftModule", file("."))
+}

0 comments on commit b7a9d60

Please sign in to comment.