Skip to content
This repository has been archived by the owner on May 21, 2021. It is now read-only.

Commit

Permalink
Merge pull request #36 from samhendley/master
Browse files Browse the repository at this point in the history
Update to your build files to build scalamodules for 2.9.0 and 2.9.0-1
  • Loading branch information
Heiko Seeberger committed Jan 11, 2012
2 parents 0a73098 + 35c6454 commit 1e3fe60
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions project/build.properties 100644 → 100755
Expand Up @@ -3,6 +3,6 @@
project.organization=com.weiglewilczek.scalamodules
project.name=scalamodules
sbt.version=0.7.4
project.version=2.0.3-SNAPSHOT
build.scala.versions=2.8.1 2.8.0
project.version=2.0.3
build.scala.versions=2.9.1 2.9.0-1 2.9.0 2.8.1 2.8.0
project.initialize=false
14 changes: 8 additions & 6 deletions project/build/ScalaModulesProject.scala 100644 → 100755
Expand Up @@ -26,15 +26,17 @@ class ScalaModulesProject(info: ProjectInfo) extends ParentProject(info) with Un
val OsgiVersion = "4.2.0"
val PaxExamVersion = "1.2.3"
val Slf4jVersion = "1.6.1"
val Slf4sVersion = "1.0.3"
val (specsVersion, mockitoVersion) = buildScalaVersion match {
case "2.8.0" => "1.6.5" -> "1.8.4"
case "2.8.1" => "1.6.7" -> "1.8.5"
val (specsVersion, mockitoVersion, slf4sVersion) = buildScalaVersion match {
case "2.8.0" => ("1.6.5","1.8.4","1.0.3")
case "2.8.1" => ("1.6.7","1.8.5","1.0.3")
case "2.9.0" => ("1.6.8","1.8.5","1.0.6")
case "2.9.0-1" => ("1.6.8","1.8.5","1.0.6")
case "2.9.1" => ("1.6.9","1.8.5","1.0.7")
case _ => error("No clue what versions for specs and mockito to use!")
}

// Compile
val slf4s = "com.weiglewilczek.slf4s" %% "slf4s" % Slf4sVersion withSources
val slf4s = "com.weiglewilczek.slf4s" %% "slf4s" % slf4sVersion withSources

// Provided
val osgiCore = "org.osgi" % "org.osgi.core" % OsgiVersion % "provided" withSources
Expand Down Expand Up @@ -100,7 +102,7 @@ class ScalaModulesProject(info: ProjectInfo) extends ParentProject(info) with Un
System.setProperty("scalaModules.version", projectVersion.value.toString)
System.setProperty("scala.version", buildScalaVersion)
System.setProperty("slf4j.version", Slf4jVersion)
System.setProperty("slf4s.version", Slf4sVersion)
System.setProperty("slf4s.version", slf4sVersion)
System.setProperty("specs.version", specsVersion)

override def libraryDependencies = Set(specs, mockito, paxExam, paxExamJUnit, paxExamCD, junitIF)
Expand Down

0 comments on commit 1e3fe60

Please sign in to comment.