import sbt._

import Keys._
import AndroidKeys._

object BaithaDefaults {
  val settings =
    Defaults.defaultSettings ++
    AndroidBase.settings ++ Seq (
      name := "Baitha: The Scala/Android Toolkit",
      organization := "com.sattvik",
      version := "0.1.0-SNAPSHOT",
      scalaVersion := "2.9.1-1",
      scalacOptions ++= Seq (
        Opts.compile.deprecation,
        Opts.compile.unchecked,
        Opts.compile.optimise
      ),
      platformName in Android := "android-15"
    )
}

object BaithaBuild extends Build {
  lazy val main = Project(
    "baitha",
    file("."),
    settings = BaithaDefaults.settings ++ Seq (
      name := "baitha-queries",
      libraryDependencies ++= Seq (
        "org.scalatest" %% "scalatest" % "1.7.1" % "test",
        "org.mockito" % "mockito-core" % "1.9.0" % "test"
      ),
      crossScalaVersions := Seq(
        "2.8.1", "2.8.2", "2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1"
      )
    )
  )
}

import sbt._

import Keys._
import AndroidKeys._

object BaithaDefaults {
  val settings =
    Defaults.defaultSettings ++
    AndroidBase.settings ++ Seq (
      name := "Baitha: The Scala/Android Toolkit",
      organization := "com.sattvik",
      version := "0.1.0-SNAPSHOT",
      scalaVersion := "2.9.1-1",
      scalacOptions ++= Seq (
        Opts.compile.deprecation,
        Opts.compile.unchecked,
        Opts.compile.optimise
      ),
      platformName in Android := "android-15"
    )
}

object BaithaBuild extends Build {
  lazy val main = Project(
    "baitha",
    file("."),
    settings = BaithaDefaults.settings ++ Seq (
      name := "baitha",
      libraryDependencies ++= Seq (
        "org.scalatest" %% "scalatest" % "1.7.1" % "test",
        "org.mockito" % "mockito-core" % "1.9.0" % "test"
      ),
      crossScalaVersions := Seq(
        "2.8.1", "2.8.2", "2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1"
      )
    )
  )
}

--- 
+++ 
@@ -25,7 +25,7 @@
     "baitha",
     file("."),
     settings = BaithaDefaults.settings ++ Seq (
-      name := "baitha",
+      name := "baitha-queries",
       libraryDependencies ++= Seq (
         "org.scalatest" %% "scalatest" % "1.7.1" % "test",
         "org.mockito" % "mockito-core" % "1.9.0" % "test"
Set up modified name for queries branch
