Merge pull request julienba#14 from Amadeus82/master

Compatibility for Play 2.2.x

Author: julienba

build.sbt

@@ -4,11 +4,13 @@ sbtPlugin := true
 
 name := "play2-plugins-mustache"
 
-version := "1.1.3-SNAPSHOT"
+version := "1.1.3"
 
 organization := "org.jba"
 
-addSbtPlugin("play" % "sbt-plugin" % "2.1.0")
+scalacOptions += "-deprecation"
+
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")
 
 libraryDependencies += "commons-lang" % "commons-lang" % "2.6"
 
@@ -22,4 +24,3 @@ publishTo <<= (version) { version: String =>
   val localRepository = Resolver.file("local repo", new java.io.File(System.getProperty("user.home") + "/tmp/repo"))(Resolver.ivyStylePatterns)
   Some(localRepository)
 }
-

project-code/project/Build.scala

@@ -6,7 +6,7 @@ object ApplicationBuild extends Build {
 
   val appName         = "play2-mustache"
 
-  val appVersion      = "1.1.2"
+  val appVersion      = "1.1.3"
 
   val appDependencies = Seq(
     "com.github.spullara.mustache.java" % "compiler" % "0.8.11",

project-code/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0

project-code/project/plugins.sbt

@@ -5,4 +5,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % Option(System.getProperty("play.version")).getOrElse("2.0.4") )
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % Option(System.getProperty("play.version")).getOrElse("2.0.4") )

project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0

src/main/scala/org/jba/SbtMustachePlugin.scala

@@ -14,7 +14,7 @@ object MustachePlugin extends sbt.Plugin {
 
   val templates = scala.collection.mutable.Map.empty[String, String]
 
-  lazy val mustacheTemplatesSettings: Seq[Project.Setting[_]] = Seq()
+  lazy val mustacheTemplatesSettings: Seq[Def.Setting[_]] = Seq()
 
   val MustacheFileCompiler = MyAssetsCompiler(
     "mustache",
@@ -48,11 +48,11 @@ object MustachePlugin extends sbt.Plugin {
     naming: (String, Boolean) => String,
     compile: (File, Seq[String]) => (String, Option[String], Seq[File]),
     optionsSettings: sbt.SettingKey[Seq[String]]) =
-    (sourceDirectory in Compile, resourceManaged in Compile, cacheDirectory, optionsSettings, filesSetting, classDirectory in Compile) map { (src, resources, cache, options, files, classDirectory) =>                                                                                                                                                                 
+    (sourceDirectory in Compile, resourceManaged in Compile, streams in Compile, optionsSettings, filesSetting, classDirectory in Compile) map { (src, resources, streams, options, files, classDirectory) =>                                                                                                                                                                 
 
       import java.io._
 
-      val cacheFile = cache / name    
+      val cacheFile = streams.cacheDirectory / name    
       val currentInfos = watch(src).get.map(f => f -> FileInfo.lastModified(f)).toMap
       val (previousRelation, previousInfo) = Sync.readInfo(cacheFile)(FileInfo.lastModified.format)                                                                                                                                                                                                                          
 
@@ -99,7 +99,7 @@ object MustachePlugin extends sbt.Plugin {
 
       }
 
-    }: sbt.Project.Initialize[sbt.Task[Seq[java.io.File]]]  
+    }: sbt.Def.Initialize[sbt.Task[Seq[java.io.File]]]  
 
   /**
    * Generate something like that: