Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1278 from lift/jnm_jsmin

Add YUI processor plugin to minify js resources
  • Loading branch information...
commit 639de47aa9e90f806d887f5ba0dd9bcad4064424 2 parents 58705b4 + fbc3efb
@dpp dpp authored
Showing with 4 additions and 3 deletions.
  1. +2 −2 project/Build.scala
  2. +2 −1  project/project/Plugins.scala
View
4 project/Build.scala
@@ -87,14 +87,14 @@ object BuildDef extends Build {
lazy val webkit =
webProject("webkit")
.dependsOn(util, testkit % "provided")
- .settings(description := "Webkit Library",
+ .settings((org.scala_tools.sbt.yuiCompressor.Plugin.yuiSettings ++ Seq(description := "Webkit Library",
parallelExecution in Test := false,
libraryDependencies <++= scalaVersion { sv =>
Seq(commons_fileupload, servlet_api, specs(sv).copy(configurations = Some("provided")), jetty6, jwebunit)
},
initialize in Test <<= (sourceDirectory in Test) { src =>
System.setProperty("net.liftweb.webapptest.src.test.webapp", (src / "webapp").absString)
- })
+ })):_*)
lazy val wizard =
webProject("wizard")
View
3  project/project/Plugins.scala
@@ -1,6 +1,7 @@
import sbt._
object PluginDef extends Build {
- lazy val root = Project("plugins", file(".")) dependsOn(buildPlugin)
+ lazy val root = Project("plugins", file(".")) dependsOn(buildPlugin, yuiPlugin)
+ lazy val yuiPlugin = uri("git://github.com/indrajitr/sbt-yui-compressor")
lazy val buildPlugin = uri("git://github.com/indrajitr/sbt-lift-build-plugin.git#c78f617f62")
}
Please sign in to comment.
Something went wrong with that request. Please try again.