You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/04/03 21:06:40 UTC

[18/50] [abbrv] logging-log4j-scala git commit: Extract methods in sbt plugin

Extract methods in sbt plugin


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/d245e724
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/d245e724
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/d245e724

Branch: refs/heads/master
Commit: d245e724c8f3d7b6fa8f4f25c4a20807edb23527
Parents: f8d3f94
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 30 17:44:46 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 30 17:44:46 2018 -0500

----------------------------------------------------------------------
 project/CopyResourcesPlugin.scala | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/d245e724/project/CopyResourcesPlugin.scala
----------------------------------------------------------------------
diff --git a/project/CopyResourcesPlugin.scala b/project/CopyResourcesPlugin.scala
index 4c3b616..32b6104 100644
--- a/project/CopyResourcesPlugin.scala
+++ b/project/CopyResourcesPlugin.scala
@@ -28,11 +28,17 @@ object CopyResourcesPlugin extends AutoPlugin {
     val extraResources = taskKey[Seq[(File, String)]]("Additional files to copy into packages")
 
     lazy val baseCopyResourceSettings: Seq[Setting[_]] = Seq(
-      extraResources := Nil,
-      mappings in (Compile, packageBin) ++= extraResources.value,
-      mappings in (Compile, packageSrc) ++= extraResources.value,
-      mappings in (Compile, packageDoc) ++= extraResources.value
-    )
+      extraResources := Nil
+    ) ++ addExtraResourcesInAll(Compile)(packageBin, packageSrc, packageDoc)
+
+    def addExtraResourcesIn(configuration: Configuration, scope: Scoped): Setting[Task[Seq[(File, String)]]] =
+      mappings in (configuration, scope) ++= extraResources.value
+
+    def addExtraResourcesInAll(configurations: Configuration*)(scopes: Scoped*): Seq[Setting[Task[Seq[(File, String)]]]] =
+      for {
+        configuration <- configurations
+        scope <- scopes
+      } yield addExtraResourcesIn(configuration, scope)
   }
 
   import autoImport._