From 188bc10d08f70daabc807559e7600ab547884c93 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sun, 24 Jan 2016 16:04:52 -0800 Subject: Set crossPaths only in project (not in global scope) --- .../main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala | 9 ++++----- 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") -- cgit v1.2.3