Skip to content
Browse files

Name now includes Lift Edition.

  • Loading branch information...
1 parent ba201ba commit fa6493065602d728a568b1227c4c5d5fdad58d9b @d6y d6y committed Apr 7, 2013
Showing with 38 additions and 20 deletions.
  1. +17 −2 README.md
  2. +17 −13 build.sbt
  3. +4 −5 project/LiftModule.scala
View
19 README.md
@@ -3,11 +3,26 @@ Machine Lift Module
This module provides "a state machine that allows you to define transition rules and events. You have to add a single column to keep track of the state of the item and machine takes care of the rest."
----
+For use with Mapper.
-**Note:** The module package changed from `net.liftweb.machine` to `net.liftmodules.machine` in May 2012. Please consider this when referencing documentation written before that date.
+To include this module in your Lift project, update your `libraryDependencies` in `build.sbt` to include:
+
+*Lift 2.5.x* for Scala 2.9 and 2.10:
+
+ "net.liftmodules" %% "machine_2.5" % "1.2"
+
+*Lift 3.0.x* for Scala 2.10:
+
+ "net.liftmodules" %% "machine_3.0" % "1.2-SNAPSHOT"
+Documentation
+=============
+
+[Lift in Action](http://www.manning.com/perrett/) uses the module in chapter 5.
+
+**Note:** The module package changed from `net.liftweb.machine` to `net.liftmodules.machine` in May 2012. Please consider this when referencing documentation written before that date.
+
Notes for module developers
===========================
View
30 build.sbt
@@ -2,39 +2,43 @@ name := "machine"
organization := "net.liftmodules"
+version := "1.2-SNAPSHOT"
+
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.2-SNAPSHOT" }
-
+liftEdition <<= liftVersion apply { _.substring(0,3) }
+
+name <<= (name, liftEdition) { (n, e) => n + "_" + e }
+
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-mapper" % v % "compile->default" ::
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-mapper" % v % "provided" ::
Nil
-}
+}
-libraryDependencies <++= scalaVersion { sv =>
- (sv match {
+libraryDependencies <++= scalaVersion { sv =>
+ (sv match {
case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
- }) ::
+ }) ::
Nil
}
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:
@@ -71,6 +75,6 @@ pomExtra := (
<name>Lift Team</name>
<url>http://www.liftmodules.net</url>
</developer>
- </developers>
+ </developers>
)
-
+
View
9 project/LiftModule.scala
@@ -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 fa64930

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