Skip to content

Commit 7999959

Browse files
committed
Build changes before the first binary release.
1 parent 2ec0c21 commit 7999959

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

build.sbt

+21-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ scalaVersion := "2.10.3"
44
// scalaHome := Some(file("/code/scala2/build/pack"))
55

66

7-
organization := "org.scala-lang.modules.async" // TODO new org name under scala-lang.
7+
organization := "org.scala-lang.modules.scala-async"
88

99
name := "scala-async"
1010

11-
version := "1.0.0-SNAPSHOT"
11+
version := "0.9.0-SNAPSHOT"
1212

1313
libraryDependencies <++= (scalaVersion) {
1414
sv => Seq(
@@ -66,7 +66,7 @@ mappings in (Compile, packageBin) += {
6666
}
6767

6868

69-
description := "An asynchronous programming facility for Scala, in the spirit of C# await/async"
69+
description := "An asynchronous programming facility for Scala that offers a direct API for working with Futures."
7070

7171
homepage := Some(url("http://github.com/scala/async"))
7272

@@ -113,3 +113,21 @@ pomExtra := (
113113
<connection>scm:git:git@github.com:scala/async.git</connection>
114114
</scm>
115115
)
116+
117+
osgiSettings
118+
119+
val osgiVersion = version(_.replace('-', '.'))
120+
121+
OsgiKeys.bundleSymbolicName := s"${organization.value}.${name.value}"
122+
123+
OsgiKeys.bundleVersion := osgiVersion.value
124+
125+
OsgiKeys.exportPackage := Seq(s"scala.async.*;version=${version.value}")
126+
127+
// Sources should also have a nice MANIFEST file
128+
packageOptions in packageSrc := Seq(Package.ManifestAttributes(
129+
("Bundle-SymbolicName", s"${organization.value}.${name.value}.source"),
130+
("Bundle-Name", s"${name.value} sources"),
131+
("Bundle-Version", osgiVersion.value),
132+
("Eclipse-SourceBundle", s"""${organization.value}.${name.value};version="${osgiVersion.value}";roots:="."""")
133+
))

project/plugins.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.6.0")

0 commit comments

Comments
 (0)