Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

build both scala 2.8.1 and 2.9.1 versions.

  • Loading branch information...
commit da3e3c4c7065e0a19c2ed9db4f37549d3b248585 1 parent 63260b3
Robey Pointer authored
Showing with 26 additions and 9 deletions.
  1. +2 −2 project/build.properties
  2. +24 −7 project/build/OstrichProject.scala
View
4 project/build.properties
@@ -1,8 +1,8 @@
#Project properties
#Mon Feb 13 15:56:46 PST 2012
project.organization=com.twitter
-project.name=ostrich_2.9.1
+project.name=ostrich
sbt.version=0.7.4
project.version=4.10.6-SNAPSHOT
-build.scala.versions=2.9.1
+build.scala.versions=2.9.1 2.8.1
project.initialize=false
View
31 project/build/OstrichProject.scala
@@ -10,16 +10,30 @@ class OstrichProject(info: ProjectInfo) extends StandardLibraryProject(info)
with PublishSourcesAndJavadocs
with PublishSite
{
- projectDependencies(
- "util" ~ "util-core_2.9.1",
- "util" ~ "util-eval_2.9.1",
- "util" ~ "util-logging_2.9.1"
- )
+ buildScalaVersion match {
+ case "2.8.1" => {
+ projectDependencies(
+ "util" ~ "util-core",
+ "util" ~ "util-eval",
+ "util" ~ "util-logging"
+ )
+ }
+ case "2.9.1" => {
+ projectDependencies(
+ "util" ~ "util-core_2.9.1",
+ "util" ~ "util-eval_2.9.1",
+ "util" ~ "util-logging_2.9.1"
+ )
+ }
+ }
- val json = "com.twitter" % "json_2.8.1" % "2.1.6"
+ val json = "com.twitter" %% "json" % "2.1.7"
// for tests:
- val specs = "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
+ val specs = buildScalaVersion match {
+ case "2.8.1" => "org.scala-tools.testing" % "specs_2.8.1" % "1.6.6" % "test"
+ case "2.9.1" => "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
+ }
val cglib = "cglib" % "cglib" % "2.1_3" % "test"
val asm = "asm" % "asm" % "1.5.3" % "test"
val objenesis = "org.objenesis" % "objenesis" % "1.1" % "test"
@@ -35,6 +49,9 @@ class OstrichProject(info: ProjectInfo) extends StandardLibraryProject(info)
</license>
</licenses>
+ // use "ostrich_<scalaversion>" as the published name:
+ override def disableCrossPaths = false
+
def ostrichPropertiesPath = (mainResourcesOutputPath ##) / "ostrich.properties"
lazy val makeOstrichProperties = task {
val properties = new Properties

0 comments on commit da3e3c4

Please sign in to comment.
Something went wrong with that request. Please try again.