WIP Switch to sbt-scalate-precompiler

skinny-framework · Mar 24, 2015 · 5986fe5 · 5986fe5
1 parent 228fd59
commit 5986fe5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -1,6 +1,6 @@
 import sbt._, Keys._
 import org.scalatra.sbt._, PluginKeys._
-import com.mojolly.scalate.ScalatePlugin._, ScalateKeys._
+import skinny.scalate.ScalatePlugin._, ScalateKeys._
 import scala.language.postfixOps
 
 object SkinnyFrameworkBuild extends Build {
@@ -18,8 +18,8 @@ object SkinnyFrameworkBuild extends Build {
     organization := "org.skinny-framework",
     version := currentVersion,
     resolvers ++= Seq(
-      "sonatype releases"  at "https://oss.sonatype.org/content/repositories/releases"
-      //, "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
+      "sonatype releases"  at "https://oss.sonatype.org/content/repositories/releases",
+      "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
     ),
     publishTo <<= version { (v: String) => _publishTo(v) },
     publishMavenStyle := true,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,14 @@
+resolvers ++= Seq(
+  "sonatype releases"  at "https://oss.sonatype.org/content/repositories/releases", 
+  "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
+)
 resolvers += Classpaths.sbtPluginReleases
+
 // TODO: https://github.com/jrudolph/sbt-dependency-graph/issues/67
 //addMavenResolverPlugin
 
-addSbtPlugin("com.mojolly.scalate" % "xsbt-scalate-generator" % "0.5.0")
+addSbtPlugin("org.skinny-framework" % "sbt-scalate-precompiler" % "1.7.1.0-SNAPSHOT")
+
 addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5" excludeAll(
   ExclusionRule(organization = "org.mortbay.jetty"),
   ExclusionRule(organization = "org.eclipse.jetty"),

diff --git a/yeoman-generator-skinny/app/templates/project/Build.scala b/yeoman-generator-skinny/app/templates/project/Build.scala
@@ -1,6 +1,6 @@
 import sbt._, Keys._
 import org.scalatra.sbt._, PluginKeys._
-import com.mojolly.scalate.ScalatePlugin._, ScalateKeys._
+import skinny.scalate.ScalatePlugin._, ScalateKeys._
 import com.earldouglas.xsbtwebplugin.WebPlugin._
 import com.earldouglas.xsbtwebplugin.PluginKeys._
 import org.sbtidea.SbtIdeaPlugin._

diff --git a/yeoman-generator-skinny/app/templates/project/plugins.sbt b/yeoman-generator-skinny/app/templates/project/plugins.sbt
@@ -2,6 +2,8 @@
 // sbt plugins for this Skinny app project
 // --------------------------------------------
 resolvers += Classpaths.sbtPluginReleases
+// TODO: remove this after sbt-scalate-precompiler initial release
+resolvers += "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 
 // Internally uses Eclipse Aether to resolve Maven dependencies instead of Apache Ivy
 // https://github.com/sbt/sbt/releases/tag/v0.13.8
@@ -28,7 +30,7 @@ addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "0.9.1" excludeAll(
   ExclusionRule(organization = "org.apache.tomcat.embed")
 ))
 // Scalate template files precompilation
-addSbtPlugin("com.mojolly.scalate" % "xsbt-scalate-generator" % "0.5.0")
+addSbtPlugin("org.skinny-framework" % "sbt-scalate-precompiler" % "1.7.1.0-SNAPSHOT")
 
 // --------
 // format Scala source code automatically