Skip to content

Commit

Permalink
1.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
lloydmeta committed Dec 22, 2018
1 parent b8f1eb7 commit 835a810
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
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.14-SNAPSHOT"
version := "1.14"

organization := "org.bytedeco"

Expand Down
7 changes: 3 additions & 4 deletions src/main/scala/org/bytedeco/sbt/javacpp/Plugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ object Plugin extends AutoPlugin {
libraryDependencies += {
"org.bytedeco" % "javacpp" % javaCppVersion.value jar
},
javaCppPresetDependencies
)
javaCppPresetDependencies)
}

object Versions {
Expand All @@ -39,7 +38,7 @@ object Plugin extends AutoPlugin {
private def javaCppPresetDependencies: Def.Setting[Seq[ModuleID]] = {
import autoImport._
libraryDependencies ++= {
val cppPresetVersion = majorMinorOnly(javaCppVersion.value)
val cppPresetVersion = buildPresetVersion(javaCppVersion.value)
javaCppPresetLibs.value.flatMap {
case (libName, libVersion) =>
val generic = "org.bytedeco.javacpp-presets" % libName % s"$libVersion-$cppPresetVersion" classifier ""
Expand All @@ -60,7 +59,7 @@ object Plugin extends AutoPlugin {
*
* @param version eg. "1.4.2"
*/
private def majorMinorOnly(version: String): String =
private def buildPresetVersion(version: String): String =
version match {
case VersionSplit(a :: b :: _) if a < 2 & b < 4 => s"$a.$b"
case VersionSplit(_) => version
Expand Down

0 comments on commit 835a810

Please sign in to comment.