Merge branch 'develop'

esamson · Oct 11, 2014 · c561636 · c561636
2 parents 75a7704 + 987635b
commit c561636
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ project/plugins/project/
 .classpath
 
 .project
+
+.idea
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Add plugin to *project/plugins.sbt*:
 
 resolvers += "Sonatype Repository" at "https://oss.sonatype.org/content/groups/public"
 
-addSbtPlugin("com.ebiznext.sbt.plugins" % "sbt-groovy" % "0.1.1")
+addSbtPlugin("com.ebiznext.sbt.plugins" % "sbt-groovy" % "0.1.2")
 ```
 
 For *.sbt* build definitions, inject the plugin settings in *build.sbt*:

diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ name := "sbt-groovy"
 
 organization := "com.ebiznext.sbt.plugins"
 
-version := "0.1.1"
+version := "0.1.2"
 
 scalaVersion := "2.10.2"
 

diff --git a/src/main/scala/GroovyPlugin.scala b/src/main/scala/GroovyPlugin.scala
@@ -28,7 +28,7 @@ object GroovyPlugin extends Plugin {
   object groovy extends Keys {
     val settings = Seq(ivyConfigurations += Config) ++ GroovyDefaults.settings ++ Seq(
       groovySource in Compile := (sourceDirectory in Compile).value / "groovy",
-      unmanagedResourceDirectories in Compile += {(groovySource in Compile).value},
+      unmanagedSourceDirectories in Compile += {(groovySource in Compile).value},
       generateStubs in Compile := {
         val sourceDirectory : File = (groovySource in Compile).value
         val nb = (sourceDirectory ** "*.groovy").get.size
@@ -80,7 +80,7 @@ object GroovyPlugin extends Plugin {
       fullClasspath <<= fullClasspath in Test,
 
       groovySource in Test := (sourceDirectory in Test).value / "groovy",
-      unmanagedResourceDirectories in Test += {(groovySource in Test).value},
+      unmanagedSourceDirectories in Test += {(groovySource in Test).value},
       generateStubs in Test := {
         val sourceDirectory : File = (groovySource in Test).value
         val nb = (sourceDirectory ** "*.groovy").get.size