Skip to content
Browse files

Switching to a simplified version schema using "net.liftmodules" %%

"fobo_x1.y1" % "x2.y2.z2[-SNAPSHOT]" where x1.y1 is the Lift major and
minor version numbers and x2.y2.z2 is the modules major,minor and
incremental version numbers.
  • Loading branch information...
1 parent d9b894c commit 9be8a40c119fb54950139653a63941fc1dc19184 @karma4u101 committed
Showing with 37 additions and 46 deletions.
  1. +5 −7 DataTables/build.sbt
  2. +5 −7 Font-Awesome/build.sbt
  3. +5 −7 Knockout/build.sbt
  4. +5 −7 Twitter-Bootstrap/build.sbt
  5. +14 −18 build.sbt
  6. +3 −0 project/LiftModuleBuild.scala
View
12 DataTables/build.sbt
@@ -1,13 +1,11 @@
-//name := "FoBo-DataTables"
-
-name <<= liftVersion apply { "FoBo-DataTables" + "_" + _ }
+name := "FoBo-DataTables"
organization := "net.liftmodules"
-//version <<= liftVersion apply { _ + "-0.1.0-SNAPSHOT" }
-
version := "0.1.0-SNAPSHOT"
+name <<= (name, liftVName) { (n, v) => n + "_" + v }
+
crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
logLevel := Level.Info //Level.Info.Debug
@@ -23,8 +21,8 @@ resolvers ++= Seq(
)
libraryDependencies <++= liftVersion { v =>
- "net.liftweb" %% "lift-webkit" % v % "compile" ::
- "net.liftweb" %% "lift-testkit" % v % "compile" ::
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-testkit" % v % "provided" ::
Nil
}
View
12 Font-Awesome/build.sbt
@@ -1,13 +1,11 @@
-//name := "FoBo-Font-Awesome"
-
-name <<= liftVersion apply { "FoBo-Font-Awesome" + "_" + _ }
+name := "FoBo-Font-Awesome"
organization := "net.liftmodules"
-//version <<= liftVersion apply { _ + "-0.1.0-SNAPSHOT" }
-
version := "0.1.0-SNAPSHOT"
+name <<= (name, liftVName) { (n, v) => n + "_" + v }
+
crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
logLevel := Level.Info //Level.Info.Debug
@@ -23,8 +21,8 @@ resolvers ++= Seq(
)
libraryDependencies <++= liftVersion { v =>
- "net.liftweb" %% "lift-webkit" % v % "compile" ::
- "net.liftweb" %% "lift-testkit" % v % "compile" ::
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-testkit" % v % "provided" ::
Nil
}
View
12 Knockout/build.sbt
@@ -1,13 +1,11 @@
-//name := "FoBo-Knockout"
-
-name <<= liftVersion apply { "FoBo-Knockout" + "_" + _ }
+name := "FoBo-Knockout"
organization := "net.liftmodules"
-//version <<= liftVersion apply { _ + "-0.1.0-SNAPSHOT" }
-
version := "0.1.0-SNAPSHOT"
+name <<= (name, liftVName) { (n, v) => n + "_" + v }
+
crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
logLevel := Level.Info //Level.Info.Debug
@@ -23,8 +21,8 @@ resolvers ++= Seq(
)
libraryDependencies <++= liftVersion { v =>
- "net.liftweb" %% "lift-webkit" % v % "compile" ::
- "net.liftweb" %% "lift-testkit" % v % "compile" ::
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-testkit" % v % "provided" ::
Nil
}
View
12 Twitter-Bootstrap/build.sbt
@@ -1,13 +1,11 @@
-//name := "FoBo-Twitter-Bootstrap"
-
-name <<= liftVersion apply { "FoBo-Twitter-Bootstrap" + "_" + _ }
+name := "FoBo-Twitter-Bootstrap"
organization := "net.liftmodules"
-//version <<= liftVersion apply { _ + "-0.2.0-SNAPSHOT" }
-
version := "0.2.0-SNAPSHOT"
+name <<= (name, liftVName) { (n, v) => n + "_" + v }
+
crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
logLevel := Level.Info //Level.Info.Debug
@@ -22,8 +20,8 @@ resolvers ++= Seq(
)
libraryDependencies <++= liftVersion { v =>
- "net.liftweb" %% "lift-webkit" % v % "compile" ::
- "net.liftweb" %% "lift-testkit" % v % "compile" ::
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-testkit" % v % "provided" ::
Nil
}
View
32 build.sbt
@@ -1,14 +1,14 @@
-liftVersion in ThisBuild <<= liftVersion ?? "2.5-RC2"
+name := "FoBo"
-//name := "FoBo"
+organization := "net.liftmodules"
-name <<= liftVersion apply { "FoBo" + "_" + _ }
+version := "0.9.3-SNAPSHOT"
-organization := "net.liftmodules"
+liftVersion in ThisBuild <<= liftVersion ?? "2.5-RC2"
-//version <<= liftVersion apply { _ + "-0.9.3-SNAPSHOT" }
+liftVName in ThisBuild <<= liftVersion apply { _.substring(0,3) }
-version := "0.9.3-SNAPSHOT"
+name <<= (name, liftVName) { (n, v) => n + "_" + v }
crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1")
@@ -27,18 +27,14 @@ resolvers ++= Seq(
"Scala" at "https://oss.sonatype.org/content/groups/scala-tools/"
)
-libraryDependencies <++= liftVersion { v =>
- "net.liftweb" %% "lift-webkit" % v % "compile" ::
- "net.liftweb" %% "lift-testkit" % v % "compile" ::
- "net.liftmodules" %% ("fobo-knockout"+"_"+v.toLowerCase) % "0.1.0-SNAPSHOT" % "compile" ::
- "net.liftmodules" %% ("fobo-datatables"+"_"+v.toLowerCase) % "0.1.0-SNAPSHOT" % "compile" ::
- "net.liftmodules" %% ("fobo-font-awesome"+"_"+v.toLowerCase) % "0.1.0-SNAPSHOT" % "compile" ::
- "net.liftmodules" %% ("fobo-twitter-bootstrap"+"_"+v.toLowerCase) % "0.2.0-SNAPSHOT" % "compile" ::
-// "net.liftmodules" %% "fobo-knockout" % (v+"-0.1.0-SNAPSHOT") % "compile" ::
-// "net.liftmodules" %% "fobo-datatables" % (v+"-0.1.0-SNAPSHOT") % "compile" ::
-// "net.liftmodules" %% "fobo-font-awesome" % (v+"-0.1.0-SNAPSHOT") % "compile" ::
-// "net.liftmodules" %% "fobo-twitter-bootstrap" % (v+"-0.2.0-SNAPSHOT") % "compile" ::
- "net.liftmodules" %% "lift-jquery-module" % (v+"-2.2") % "compile" ::
+libraryDependencies <++= (liftVersion,liftVName) { (v,n) =>
+ "net.liftweb" %% "lift-webkit" % v % "provided" ::
+ "net.liftweb" %% "lift-testkit" % v % "provided" ::
+ "net.liftmodules" %% ("fobo-knockout"+"_"+n) % "0.1.0-SNAPSHOT" % "compile" ::
+ "net.liftmodules" %% ("fobo-datatables"+"_"+n) % "0.1.0-SNAPSHOT" % "compile" ::
+ "net.liftmodules" %% ("fobo-font-awesome"+"_"+n) % "0.1.0-SNAPSHOT" % "compile" ::
+ "net.liftmodules" %% ("fobo-twitter-bootstrap"+"_"+n) % "0.2.0-SNAPSHOT" % "compile" ::
+ "net.liftmodules" %% "lift-jquery-module" % (v+"-2.2") % "compile" ::
Nil
}
View
3 project/LiftModuleBuild.scala
@@ -1,10 +1,13 @@
import sbt._
import sbt.Keys._
+import java.lang.String
object LiftModuleFoBoBuild extends Build {
val liftVersion = SettingKey[String]("liftVersion", "Version number of the Lift Web Framework")
+ val liftVName = SettingKey[String]("liftVName", "Lift Web Framework short version number to append to artifact name")
+
lazy val root = Project(id = "FoBo",
base = file(".")) dependsOn(bootstrap,fontAwesome,datatables,knockout)

0 comments on commit 9be8a40

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