From d15602f43f128cc68f31257ba94a6a1613f15f24 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sun, 24 Jan 2016 17:42:46 -0800 Subject: Fix contents of nativeLibraries setting --- .../src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala | 2 +- project/Build.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala b/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala index 22c42a1..cc3a851 100644 --- a/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala +++ b/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala @@ -88,7 +88,7 @@ object JniPackaging extends AutoPlugin { }.value, // managed native libraries take precedence - nativeLibraries := unmanagedNativeLibraries.value ++ unmanagedNativeLibraries.value, + nativeLibraries := unmanagedNativeLibraries.value ++ managedNativeLibraries.value, resourceGenerators += Def.task { diff --git a/project/Build.scala b/project/Build.scala index fce483e..ec3c19f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -9,7 +9,7 @@ object JniBuild extends Build { val scalaVersions = List("2.11.7", "2.12.0-M3", "2.10.5") val commonSettings = Seq( - version := "0.4.2-SNAPSHOT", + version := "0.4.2", organization := "ch.jodersky", licenses := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause"))), scalacOptions ++= Seq("-deprecation", "-feature") -- cgit v1.2.3