Skip to content

Fix OSGi settings #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2014
Merged

Fix OSGi settings #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/main/scala/ScalaModulePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down Expand Up @@ -78,8 +75,13 @@ object ScalaModulePlugin extends Plugin {
<name>Typesafe, Inc.</name>
</developer>
</developers>
),
)
)

// 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,

Expand All @@ -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)
}