Merge pull request #7 from bytedeco/upgrade/javacpp-1.2

Upgrade to JavaCPP 1.2
bytedeco · Jul 21, 2016 · 61f11c7 · 61f11c7
2 parents 5d3fe20 + 30c45c0
commit 61f11c7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README.markdown b/README.markdown
@@ -16,7 +16,7 @@ Configures the following dependencies in your project:
 In your `project/plugins.sbt`:
 
 ```scala
-addSbtPlugin("org.bytedeco" % "sbt-javacv" % "1.7")
+addSbtPlugin("org.bytedeco" % "sbt-javacv" % "1.8")
 ```
 
 ## Customisation

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := """sbt-javacv"""
 
-version := "1.7"
+version := "1.8-SNAPSHOT"
 
 organization := "org.bytedeco"
 
@@ -49,4 +49,4 @@ resolvers ++= Seq(
   Resolver.sonatypeRepo("snapshots")
 )
 
-addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.4")
+addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.5")
diff --git a/project/build.properties b/project/build.properties
@@ -1,4 +1,4 @@
 #Activator-generated Properties
 #Mon Feb 22 20:41:33 JST 2016
 template.uuid=e17acfbb-1ff5-41f5-b8cf-2c40be6a8340
-sbt.version=0.13.11
+sbt.version=0.13.12
diff --git a/src/main/scala/org/bytedeco/sbt/javacv/Plugin.scala b/src/main/scala/org/bytedeco/sbt/javacv/Plugin.scala
@@ -37,7 +37,7 @@ object Plugin extends AutoPlugin {
      * List of default JavaCPP preset names and versions that will be added by this plugin
      */
     val libs = Seq(
-      "opencv" -> "3.0.0",
+      "opencv" -> "3.1.0",
       "videoinput" -> "0.200"
     )
   }