From dd4a890bdbbfca059fec9d3e162420bb9769536d Mon Sep 17 00:00:00 2001
From: antidata <antidata.05@gmail.com>
Date: Wed, 11 Apr 2018 19:33:17 -0400
Subject: [PATCH 1/4] #30 removing untyped sbtjs and adding yuiCompressor
 settings

---
 build.sbt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 6941bf05..0e376fa9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -86,11 +86,11 @@ pomExtra := (
 
 licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html"))
 
-Seq(com.untyped.sbtjs.Plugin.jsSettings : _*)
-(sourceDirectory in (Compile, JsKeys.js)) := (sourceDirectory in Compile).value / "js"
-(resourceManaged in (Compile, JsKeys.js)) := (resourceManaged in Compile).value / "toserve" / "net" / "liftmodules" / "ng" / "js"
-(JsKeys.filenameSuffix in Compile) :=  "-" + version.value + ".min"
-(resourceGenerators in Compile) += (JsKeys.js in Compile)
+Seq(yuiSettings: _*)
+unmanagedResourceDirectories in (Compile, YuiCompressorKeys.jsResources) += { (sourceDirectory in Compile).value / "js" }
+resourceManaged in (Compile, YuiCompressorKeys.jsCompressor) := resourceManaged.value / "toserve" / "net" / "liftmodules" / "ng" / "js"
+YuiCompressorKeys.minSuffix :=  "-" + version.value + ".min"
+
 copyJs
 
 // Jasmine stuff

From bc17bc060a8922dbbaeae585bc83d916b8570ad8 Mon Sep 17 00:00:00 2001
From: antidata <antidata.05@gmail.com>
Date: Wed, 11 Apr 2018 19:33:44 -0400
Subject: [PATCH 2/4] #30 Adding yuiCompressor plugin

---
 project/project/Plugin.scala | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 project/project/Plugin.scala

diff --git a/project/project/Plugin.scala b/project/project/Plugin.scala
new file mode 100644
index 00000000..244820d1
--- /dev/null
+++ b/project/project/Plugin.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+object PluginDef extends Build {
+  lazy val root = Project("plugins", file(".")) dependsOn(yuiCompressorPlugin)
+  lazy val yuiCompressorPlugin = uri("git://github.com/indrajitr/sbt-yui-compressor.git#89304ec0c988183d1f1a889e665e0269fe513031")
+}
\ No newline at end of file

From b673853182d70f1e3cfb0664dc8efa30968e1da5 Mon Sep 17 00:00:00 2001
From: antidata <antidata.05@gmail.com>
Date: Wed, 11 Apr 2018 19:34:03 -0400
Subject: [PATCH 3/4] #30 Removing untyped

---
 project/plugins.sbt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 71b75605..05e0319f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,8 +2,6 @@ resolvers += Resolver.bintrayIvyRepo("untyped", "ivy")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.2")
 
-addSbtPlugin("com.untyped" % "sbt-js" % "0.8") // https://github.com/untyped/sbt-plugins
-
 addSbtPlugin("com.joescii" % "sbt-jasmine-plugin" % "1.3.0")
 
 addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC3")

From 0639001d202832ad9579d6e2038bca96cab718e5 Mon Sep 17 00:00:00 2001
From: antidata <antidata.05@gmail.com>
Date: Wed, 11 Apr 2018 19:46:25 -0400
Subject: [PATCH 4/4] #30 Fixing Path

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 0e376fa9..1374385c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -88,7 +88,7 @@ licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html"
 
 Seq(yuiSettings: _*)
 unmanagedResourceDirectories in (Compile, YuiCompressorKeys.jsResources) += { (sourceDirectory in Compile).value / "js" }
-resourceManaged in (Compile, YuiCompressorKeys.jsCompressor) := resourceManaged.value / "toserve" / "net" / "liftmodules" / "ng" / "js"
+resourceManaged in (Compile, YuiCompressorKeys.jsCompressor) := (resourceManaged in Compile).value / "toserve" / "net" / "liftmodules" / "ng" / "js"
 YuiCompressorKeys.minSuffix :=  "-" + version.value + ".min"
 
 copyJs