From 294110e2b8074e13c50aeb8e4e734fe77651433c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 19 Dec 2017 00:44:31 -0500 Subject: [PATCH] Remove JNA from sbt/sbt There's a conflict in JNA version difference between sbt and IO. Fixes #3821 --- build.sbt | 3 +-- project/Dependencies.scala | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 368393d59..dcedffd62 100644 --- a/build.sbt +++ b/build.sbt @@ -311,8 +311,7 @@ lazy val commandProj = (project in file("main-command")) .settings( testedBaseSettings, name := "Command", - libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson.value, templateResolverApi, - jna, jnaPlatform), + libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson.value, templateResolverApi), managedSourceDirectories in Compile += baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f8e14429f..73405aea8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -106,8 +106,6 @@ object Dependencies { val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1" val junit = "junit" % "junit" % "4.11" 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 ( scalaBinaryVersion.value match {