aboutsummaryrefslogtreecommitdiff
path: root/jni-plugin/src/main/scala/ch/jodersky/sbt/jni
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-01-24 16:04:52 -0800
committerJakob Odersky <jakob@odersky.com>2016-01-24 16:04:52 -0800
commit188bc10d08f70daabc807559e7600ab547884c93 (patch)
tree0ae53bddd6a9fcc67665db7ea0dd247523e835e1 /jni-plugin/src/main/scala/ch/jodersky/sbt/jni
parent1531c1150aaf187bc64d07eaf6d9e1ca0d88ce57 (diff)
downloadsbt-jni-0.4.1.tar.gz
sbt-jni-0.4.1.tar.bz2
sbt-jni-0.4.1.zip
Set crossPaths only in project (not in global scope)v0.4.1
Diffstat (limited to 'jni-plugin/src/main/scala/ch/jodersky/sbt/jni')
-rw-r--r--jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala9
1 files changed, 4 insertions, 5 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
+
}