From c6e79dda2a331545c84d0b5a134be5e14e51112d Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 4 Nov 2016 20:03:58 +0000
Subject: Avoid 2 more deprecated sbt 0.12 operators

---
 build.sbt          | 2 +-
 project/Osgi.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index 75576c2411..cd9a23b6fe 100644
--- a/build.sbt
+++ b/build.sbt
@@ -876,7 +876,7 @@ lazy val dist = (project in file("dist"))
       IO.write(props, null, propsFile)
       (buildDirectory in ThisBuild).value / "quick"
     }.dependsOn((distDependencies.map(products in Runtime in _) :+ mkBin): _*).value,
-    mkPack <<= Def.task { (buildDirectory in ThisBuild).value / "pack" } dependsOn (packagedArtifact in (Compile, packageBin), mkBin),
+    mkPack := Def.task { (buildDirectory in ThisBuild).value / "pack" }.dependsOn(packagedArtifact in (Compile, packageBin), mkBin).value,
     target := (baseDirectory in ThisBuild).value / "target" / thisProject.value.id,
     packageBin in Compile := {
       val extraDeps = Set(scalaSwingDep, scalaParserCombinatorsDep, scalaXmlDep)
diff --git a/project/Osgi.scala b/project/Osgi.scala
index 0bada7d6ed..3b578572c9 100644
--- a/project/Osgi.scala
+++ b/project/Osgi.scala
@@ -41,7 +41,7 @@ object Osgi {
       bundleTask(headers.value.toMap, jarlist.value, (products in Compile in packageBin).value,
         (artifactPath in (Compile, packageBin)).value, res, streams.value)
     }.value,
-    packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), bundle).identityMap,
+    packagedArtifact in (Compile, packageBin) := (((artifact in (Compile, packageBin)).value, bundle.value)),
     // Also create OSGi source bundles:
     packageOptions in (Compile, packageSrc) += Package.ManifestAttributes(
       "Bundle-Name" -> (description.value + " Sources"),
-- 
cgit v1.2.3