diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d35e1d9..b3b1db6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,8 +3,8 @@ import sbt._ object Library { // Versions - val bndVersion = "4.2.0" - val specs2Version = "3.9.4" + val bndVersion = "5.1.2" + val specs2Version = "4.10.3" // Libraries val bndLib = "biz.aQute.bnd" % "biz.aQute.bndlib" % bndVersion diff --git a/project/build.properties b/project/build.properties index e2820dd..0837f7a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1 @@ -sbt.version=1.2.8 - +sbt.version=1.3.13 diff --git a/src/main/scala/com/typesafe/sbt/osgi/Osgi.scala b/src/main/scala/com/typesafe/sbt/osgi/Osgi.scala index 0395a34..ea3f06b 100644 --- a/src/main/scala/com/typesafe/sbt/osgi/Osgi.scala +++ b/src/main/scala/com/typesafe/sbt/osgi/Osgi.scala @@ -28,7 +28,7 @@ import sbt._ import sbt.Keys._ import sbt.Package.ManifestAttributes -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ import scala.language.implicitConversions private object Osgi { @@ -73,8 +73,8 @@ private object Osgi { builder.build } val log = streams.log - builder.getWarnings.foreach(s => log.warn(s"bnd: $s")) - builder.getErrors.foreach(s => log.error(s"bnd: $s")) + builder.getWarnings.asScala.foreach(s => log.warn(s"bnd: $s")) + builder.getErrors.asScala.foreach(s => log.error(s"bnd: $s")) jar.write(tmpArtifactPath) IO.move(tmpArtifactPath, artifactPath) artifactPath