Skip to content

Commit

Permalink
1.6.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
lloydmeta committed Jul 21, 2016
1 parent c5c558f commit 8731964
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Makes it easy to start playing around with JavaCPP in an SBT project.
In your `project/plugins.sbt`:

```scala
addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.6")
addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.6.1")
```

Adding the above line will set up your project's classpath to include `maven-plugins` as well as a add a dependency on
Expand All @@ -19,7 +19,7 @@ of adding the proper native preset for your target platform as well:
```scala
// in build.sbt

javaCppPresetLibs ++= Seq("opencv" -> "3.0.0", "ffmpeg" -> "2.8.1")
javaCppPresetLibs ++= Seq("opencv" -> "3.1.0", "ffmpeg" -> "2.8.1")

```

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := """sbt-javacpp"""

version := "1.7-SNAPSHOT"
version := "1.6.1"

organization := "org.bytedeco"

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/bytedeco/sbt/javacpp/Plugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ object Plugin extends AutoPlugin {
val majorMinorJavaCppVersion = majorMinorOnly(resolvedJavaCppVersion)
resolvedJavaCppPresetLibs.flatMap {
case (libName, libVersion) => {
val generic = "org.bytedeco.javacpp-presets" % libName % s"$libVersion-$resolvedJavaCppVersion" classifier ""
val generic = "org.bytedeco.javacpp-presets" % libName % s"$libVersion-$majorMinorJavaCppVersion" classifier ""
val platformSpecific = resolvedJavaCppPlatforms.map { platform =>
"org.bytedeco.javacpp-presets" % libName % s"$libVersion-$majorMinorJavaCppVersion" classifier platform
}
Expand Down

0 comments on commit 8731964

Please sign in to comment.