diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-11-10 15:30:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 15:30:39 +1000 |
| commit | 8f81917f11db0fdcdc49ec1cdf8f27335eabd65d (patch) | |
| tree | f1be6adc795345cd1d3650a096c0334cc11bb6f6 /project/Osgi.scala | |
| parent | ff32c8a4129b58839568c70a8ef76a52436366f5 (diff) | |
| parent | c5442931c7c1f3d1cd74d4626a81ec36c63f7624 (diff) | |
| download | scala-8f81917f11db0fdcdc49ec1cdf8f27335eabd65d.tar.gz scala-8f81917f11db0fdcdc49ec1cdf8f27335eabd65d.tar.bz2 scala-8f81917f11db0fdcdc49ec1cdf8f27335eabd65d.zip | |
Merge pull request #5501 from SethTisue/sbt-deprecations
avoid deprecated sbt 0.12 operators
Diffstat (limited to 'project/Osgi.scala')
| -rw-r--r-- | project/Osgi.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project/Osgi.scala b/project/Osgi.scala index 8a62c9128a..3b578572c9 100644 --- a/project/Osgi.scala +++ b/project/Osgi.scala @@ -36,12 +36,12 @@ object Osgi { ) }, jarlist := false, - bundle <<= Def.task { + bundle := Def.task { val res = (products in Compile in packageBin).value bundleTask(headers.value.toMap, jarlist.value, (products in Compile in packageBin).value, (artifactPath in (Compile, packageBin)).value, res, streams.value) - }, - packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), bundle).identityMap, + }.value, + 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"), |