v1.2 release

lloydmeta · Mar 7, 2016 · 20c49a5 · 20c49a5
1 parent e9630ef
commit 20c49a5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/README.markdown b/README.markdown
@@ -20,7 +20,7 @@ of adding the proper native preset for your target platform as well:
 // in build.sbt
 import import com.beachape.sbt.javacpp.{ Plugin => JavaCppPlugin }
 
-JavaCppPlugin.javaCppPresetDependency("opencv")
+JavaCppPlugin.javaCppPresetDependency("opencv", "ffmpeg")
 ```
 
 ## Customisation

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := """sbt-javacpp"""
 
-version := "1.2-SNAPSHOT"
+version := "1.2"
 
 organization := "com.beachape"
 

diff --git a/src/main/scala/com/beachape/sbt/javacpp/Plugin.scala b/src/main/scala/com/beachape/sbt/javacpp/Plugin.scala
@@ -38,14 +38,16 @@ object Plugin extends AutoPlugin {
   /**
    * Given the name of a JavaCpp preset library, appends the proper preset native wrapper dependencies (according to the javaCppPlatform setting)
    */
-  def javaCppPresetDependency(javaCppPresetLib: String): Def.Setting[Seq[ModuleID]] = {
+  def javaCppPresetDependency(javaCppPresetLib: String*): Def.Setting[Seq[ModuleID]] = {
     import autoImport._
     libraryDependencies <++= (javaCppPlatform, javaCppVersion, javaCppPresetsVersion) {
       (resolvedJavaCppPlatform, resolvedJavaCppVersion, resolvedJavaCppPresetsVersion) =>
-        Seq(
-          "org.bytedeco.javacpp-presets" % javaCppPresetLib % s"$resolvedJavaCppPresetsVersion-$resolvedJavaCppVersion" classifier "",
-          "org.bytedeco.javacpp-presets" % javaCppPresetLib % s"$resolvedJavaCppPresetsVersion-$resolvedJavaCppVersion" classifier resolvedJavaCppPlatform
-        )
+        javaCppPresetLib.flatMap { lib =>
+          Seq(
+            "org.bytedeco.javacpp-presets" % lib % s"$resolvedJavaCppPresetsVersion-$resolvedJavaCppVersion" classifier "",
+            "org.bytedeco.javacpp-presets" % lib % s"$resolvedJavaCppPresetsVersion-$resolvedJavaCppVersion" classifier resolvedJavaCppPlatform
+          )
+        }
     }
   }