diff options
| author | Johannes Rudolph <johannes.rudolph@gmail.com> | 2013-10-24 00:07:51 +0200 |
|---|---|---|
| committer | Johannes Rudolph <johannes.rudolph@gmail.com> | 2013-10-24 00:07:51 +0200 |
| commit | 7ca90e2bae7f0ea5d441b93ace59e807e53084d9 (patch) | |
| tree | f6c94d5fd94eddf14b1b518917001521a0cd0809 | |
| parent | bd1a8a0c20996489e4f723a35b640562edf4b5df (diff) | |
| parent | 40ab6337c2f84d85a80d150bf55f9e8a202adcc6 (diff) | |
| download | sbt-boilerplate-7ca90e2bae7f0ea5d441b93ace59e807e53084d9.tar.gz sbt-boilerplate-7ca90e2bae7f0ea5d441b93ace59e807e53084d9.tar.bz2 sbt-boilerplate-7ca90e2bae7f0ea5d441b93ace59e807e53084d9.zip | |
Merge branch '0.5.1'
| -rw-r--r-- | build.sbt | 4 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/spray/boilerplate/BoilerplatePlugin.scala | 5 |
4 files changed, 9 insertions, 4 deletions
@@ -18,7 +18,7 @@ sbtPlugin := true scalacOptions := Seq("-deprecation", "-encoding", "utf8") -CrossBuilding.crossSbtVersions := Seq("0.11.2", "0.11.3", "0.12") +CrossBuilding.crossSbtVersions := Seq("0.11.2", "0.11.3", "0.12", "0.13") /////////////// // publishing @@ -37,3 +37,5 @@ seq(lsSettings :_*) (LsKeys.tags in LsKeys.lsync) := Seq("sbt-plugin", "sbt", "plugin", "boilerplate", "code-generation") (LsKeys.docsUrl in LsKeys.lsync) <<= homepage + +crossBuildingSettings diff --git a/project/build.properties b/project/build.properties index 9b860e2..5e96e96 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.3 +sbt.version=0.12.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index b8ad27c..a241787 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,4 +5,4 @@ resolvers ++= Seq( addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2") -addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.7.0") +addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.0") diff --git a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala index 6049c98..149192c 100644 --- a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala +++ b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala @@ -38,7 +38,7 @@ object BoilerplatePlugin extends Plugin { def watch(sourceDirKey: SettingKey[File], filterKey: SettingKey[FileFilter], excludeKey: SettingKey[FileFilter]) = watchSources <++= (sourceDirKey, filterKey, excludeKey) map descendents def descendents(sourceDir: File, filt: FileFilter, excl: FileFilter) = - sourceDir.descendentsExcept(filt, excl).get + descendantsExcept(sourceDir, filt, excl).get def generateFromTemplates(streams: TaskStreams, sourceDir: File, targetDir: File): Seq[File] = { val files = sourceDir ** "*.template" @@ -65,4 +65,7 @@ object BoilerplatePlugin extends Plugin { mapping.map(_._2) } } + + def descendantsExcept(path: PathFinder, include: FileFilter, intermediateExclude: FileFilter): PathFinder = + (path ** include) --- (path ** intermediateExclude ** include) } |