From 9175c6aaeea09c593664fcb7b911fc63a02ff4f4 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Sat, 25 Jan 2014 15:52:06 -0800 Subject: [PATCH] Fix OSGi settings --- src/main/scala/ScalaModulePlugin.scala | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/scala/ScalaModulePlugin.scala b/src/main/scala/ScalaModulePlugin.scala index 1d2721a..827048e 100644 --- a/src/main/scala/ScalaModulePlugin.scala +++ b/src/main/scala/ScalaModulePlugin.scala @@ -12,9 +12,6 @@ object ScalaModulePlugin extends Plugin { case sv => sbt.CrossVersion.binaryScalaVersion(sv) } - // a setting-transform to turn the regular version into something osgi can deal with - val osgiVersion = version(_.replace('-', '.')) - lazy val scalaModuleSettings = Seq( repoName := name.value, @@ -78,8 +75,13 @@ object ScalaModulePlugin extends Plugin { Typesafe, Inc. - ), + ) + ) + // a setting-transform to turn the regular version into something osgi can deal with + val osgiVersion = version(_.replace('-', '.')) + + lazy val scalaModuleOsgiSettings = SbtOsgi.osgiSettings ++ Seq( OsgiKeys.bundleSymbolicName := s"${organization.value}.${name.value}", OsgiKeys.bundleVersion := osgiVersion.value, @@ -90,13 +92,14 @@ object ScalaModulePlugin extends Plugin { ("Bundle-Version", osgiVersion.value), ("Eclipse-SourceBundle", s"""${organization.value}.${name.value};version="${osgiVersion.value}";roots:="."""") )) + ) - // TODO: mima - // resolvers += Classpaths.typesafeResolver - // addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.5") - // import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings - // import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact - // previousArtifact := Some(organization.value %% name.value % binaryReferenceVersion.value) - ) + + // TODO: mima + // resolvers += Classpaths.typesafeResolver + // addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.5") + // import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings + // import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact + // previousArtifact := Some(organization.value %% name.value % binaryReferenceVersion.value) }