diff options
author | Jakob Odersky <jakob@odersky.com> | 2016-01-24 16:04:52 -0800 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2016-01-24 16:04:52 -0800 |
commit | 188bc10d08f70daabc807559e7600ab547884c93 (patch) | |
tree | 0ae53bddd6a9fcc67665db7ea0dd247523e835e1 | |
parent | 1531c1150aaf187bc64d07eaf6d9e1ca0d88ce57 (diff) | |
download | sbt-jni-188bc10d08f70daabc807559e7600ab547884c93.tar.gz sbt-jni-188bc10d08f70daabc807559e7600ab547884c93.tar.bz2 sbt-jni-188bc10d08f70daabc807559e7600ab547884c93.zip |
Set crossPaths only in project (not in global scope)v0.4.1
-rw-r--r-- | jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala | 9 | ||||
-rw-r--r-- | project/Build.scala | 2 |
2 files changed, 5 insertions, 6 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 1d874cc..22c42a1 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 @@ -108,13 +108,12 @@ object JniPackaging extends AutoPlugin { resource } resources - }.taskValue, - - //don't add scala version to native jars - crossPaths in Global := false + }.taskValue ) - override lazy val projectSettings = inConfig(Compile)(settings) + override lazy val projectSettings = inConfig(Compile)(settings) ++ + Seq(crossPaths := false) //don't add scala version to native jars + } diff --git a/project/Build.scala b/project/Build.scala index 27261a6..40c6a19 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.1-SNAPSHOT", + version := "0.4.1", organization := "ch.jodersky", licenses := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause"))), scalacOptions ++= Seq("-deprecation", "-feature") |