Revert "Merge pull request #335 from NICTA/topic/thrift-wire-format"

This reverts commit e9b295c, reversing
changes made to b80427e.

project/build.scala

@@ -52,49 +52,23 @@ object build extends Build {
     id = "scoobi",
     base = file("."),
     configurations = Configurations.default ++ Seq(repl.Repl),
-    settings = Seq(name := "scoobi-parent") ++
-      moduleSettings                 ++
-      siteSettings                   ++
-      releaseSettings                ++
-      Seq(sourceDirectory := file("ignoreme"))
-  ).aggregate(core, thrift)
-
-  lazy val moduleSettings: Seq[Settings] =
-     Defaults.defaultSettings   ++
-       scoobiSettings           ++
-       buildSettings            ++
-       compilationSettings      ++
-       testingSettings          ++
-       publicationSettings      ++
-       mimaSettings             ++
-       notificationSettings     ++
-       dependencies.resolversSettings ++
-       repl.settings
-
-  lazy val core = Project(
-    id = "core",
-    base = file("scoobi-core"),
-    settings = moduleSettings ++ Seq(
-        name := "scoobi"
-      // We're playing games with SBT to avoid having to move everything from 'src' to 'scoobi-core'
-      , sourceDirectory := baseDirectory.value.getParentFile / "src"
-      , dependencies.dependencies
-      , (sourceGenerators in Compile) <+= (sourceManaged in Compile) map GenWireFormat.gen
-    )
+    settings = Defaults.defaultSettings ++
+               scoobiSettings           ++
+               dependencies.settings    ++
+               buildSettings            ++
+               compilationSettings      ++
+               testingSettings          ++
+               siteSettings             ++
+               publicationSettings      ++
+               mimaSettings             ++ 
+               notificationSettings     ++
+               releaseSettings          ++
+               repl.settings
   )
 
-  lazy val thrift = Project(
-    id = "thrift"
-  , base = file("scoobi-thrift")
-  , settings = moduleSettings ++ Seq[Settings](
-      name := "scoobi-thrift"
-    , libraryDependencies ++= dependencies.thrift ++ dependencies.specs2()
-    )
-  )
-  .dependsOn(core)
-
   lazy val scoobiVersion = SettingKey[String]("scoobi-version", "defines the current Scoobi version")
   lazy val scoobiSettings: Seq[Settings] = Seq(
+    name := "scoobi",
     organization := "com.nicta",
     scoobiVersion in GlobalScope <<= version,
     scalaVersion := "2.11.2",
@@ -115,6 +89,7 @@ object build extends Build {
 
 
   lazy val compilationSettings: Seq[Settings] = Seq(
+    (sourceGenerators in Compile) <+= (sourceManaged in Compile) map GenWireFormat.gen,
     incOptions := incOptions.value.withNameHashing(true),
     scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-language:_"),
     scalacOptions in Test ++= Seq("-Yrangepos")

project/dependencies.scala

@@ -18,6 +18,7 @@ import Keys._
 
 object dependencies {
 
+  lazy val settings = dependencies ++ resolversSettings
   lazy val dependencies = libraryDependencies ++=
     scoobi(scalaVersion.value) ++
     hadoop(version.value)      ++
@@ -61,10 +62,6 @@ object dependencies {
     "org.specs2"                        %% "specs2-html"               % specs2Version      ,
     "org.specs2"                        %% "specs2-analysis"           % specs2Version      ).map(_ % "test")
 
-  val thrift = Seq(
-    "org.apache.thrift"                  % "libthrift"                 % "0.9.1"
-  )
-
   def repl(scalaVersion: String) = Seq(
     if (scalaVersion.contains("2.10"))
     "org.scala-lang"                    %  "jline"                     % scalaVersion

project/plugins.sbt

@@ -16,6 +16,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
 
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.1")
-
-resolvers += Resolver.sonatypeRepo("releases")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.1")