Skip to content
This repository
Browse code

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
David Pollak authored June 13, 2012
4  project/Build.scala
@@ -87,14 +87,14 @@ object BuildDef extends Build {
87 87
   lazy val webkit =
88 88
     webProject("webkit")
89 89
         .dependsOn(util, testkit % "provided")
90  
-        .settings(description := "Webkit Library",
  90
+        .settings((org.scala_tools.sbt.yuiCompressor.Plugin.yuiSettings ++ Seq(description := "Webkit Library",
91 91
                   parallelExecution in Test := false,
92 92
                   libraryDependencies <++= scalaVersion { sv =>
93 93
                     Seq(commons_fileupload, servlet_api, specs(sv).copy(configurations = Some("provided")), jetty6, jwebunit)
94 94
                   },
95 95
                   initialize in Test <<= (sourceDirectory in Test) { src =>
96 96
                     System.setProperty("net.liftweb.webapptest.src.test.webapp", (src / "webapp").absString)
97  
-                  })
  97
+                  })):_*)
98 98
 
99 99
   lazy val wizard =
100 100
     webProject("wizard")
3  project/project/Plugins.scala
... ...
@@ -1,6 +1,7 @@
1 1
 import sbt._
2 2
 
3 3
 object PluginDef extends Build {
4  
-  lazy val root              = Project("plugins", file(".")) dependsOn(buildPlugin)
  4
+  lazy val root              = Project("plugins", file(".")) dependsOn(buildPlugin, yuiPlugin)
  5
+  lazy val yuiPlugin	     = uri("git://github.com/indrajitr/sbt-yui-compressor")
5 6
   lazy val buildPlugin       = uri("git://github.com/indrajitr/sbt-lift-build-plugin.git#c78f617f62")
6 7
 }

0 notes on commit 639de47

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