luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove JNA from sbt/sbt 

There's a conflict in JNA version difference between sbt and IO.

Fixes #3821
This commit is contained in:
Eugene Yokota 2017-12-19 00:44:31 -05:00
parent c920919c2c
commit 294110e2b8
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -311,8 +311,7 @@ lazy val commandProj = (project in file("main-command"))
.settings( .settings(
testedBaseSettings, testedBaseSettings,
name := "Command", name := "Command",
libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson.value, templateResolverApi, libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson.value, templateResolverApi),
jna, jnaPlatform),
managedSourceDirectories in Compile += managedSourceDirectories in Compile +=
baseDirectory.value / "src" / "main" / "contraband-scala", baseDirectory.value / "src" / "main" / "contraband-scala",
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",

2
project/Dependencies.scala
View File

@ -106,8 +106,6 @@ object Dependencies {
val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1" val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1"
val junit = "junit" % "junit" % "4.11" val junit = "junit" % "junit" % "4.11"
val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1" val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1"
val jna = "net.java.dev.jna" % "jna" % "4.1.0"
val jnaPlatform = "net.java.dev.jna" % "jna-platform" % "4.1.0"
private def scala211Module(name: String, moduleVersion: String) = Def setting ( private def scala211Module(name: String, moduleVersion: String) = Def setting (
scalaBinaryVersion.value match { scalaBinaryVersion.value match {