diff options
| author | Dale Wijnand <dale.wijnand@gmail.com> | 2016-11-04 20:03:58 +0000 |
|---|---|---|
| committer | Dale Wijnand <dale.wijnand@gmail.com> | 2016-11-04 20:03:58 +0000 |
| commit | c6e79dda2a331545c84d0b5a134be5e14e51112d (patch) | |
| tree | 8e9227abc77be3fc3e26c29d811fef0c28c1e40c | |
| parent | fd3610c5789cc6afcd124394fda270003ade6cc8 (diff) | |
| download | scala-c6e79dda2a331545c84d0b5a134be5e14e51112d.tar.gz scala-c6e79dda2a331545c84d0b5a134be5e14e51112d.tar.bz2 scala-c6e79dda2a331545c84d0b5a134be5e14e51112d.zip | |
Avoid 2 more deprecated sbt 0.12 operators
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | project/Osgi.scala | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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"), |