Merge pull request #15 from intenthq/upgrade-thrift

Upgrade Thrift to 0.10.0, bump Pucket to 1.5.0.

Author: albertpastrana

.gitignore

@@ -1,5 +1,20 @@
+*.class
+*.log
+
+# sbt specific
+.cache
+.history
+.lib/
+dist/*
 target/
-.DS_Store
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.ensime
+.ensime_cache/
+.scala_dependencies
+.worksheet
 .idea
-.idea_modules
-*.swp

.travis.yml

@@ -2,16 +2,16 @@ language: scala
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev
-  - wget http://www.us.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz
-  - tar xfz thrift-0.9.3.tar.gz && mv thrift-0.9.3 .thrift-0.9.3
-  - cd .thrift-0.9.3 && ./configure --with-java --without-c_glib --without-cpp --without-csharp --without-python --without-ruby --without-haskell --without-perl --without-php --without-erlang --without-go --without-d --without-nodejs --without-lua && make && sudo make install && cd -
+  - wget http://www.us.apache.org/dist/thrift/0.10.0/thrift-0.10.0.tar.gz
+  - tar xfz thrift-0.10.0.tar.gz && mv thrift-0.10.0 .thrift-0.10.0
+  - cd .thrift-0.10.0 && ./configure --with-java --without-c_glib --without-cpp --without-csharp --without-python --without-ruby --without-haskell --without-perl --without-php --without-erlang --without-go --without-d --without-nodejs --without-lua && make && sudo make install && cd -
 scala:
    - 2.11.7
 script:
   - sbt ++2.11.8 test
   - sbt ++2.10.6 test
 cache:
   directories:
-   - ~/.thrift-0.9.3
+   - ~/.thrift-0.10.0
    - ~/.ivy2
    - ~/.sbt

README.md

@@ -12,29 +12,29 @@ The following top level dependencies are published in Maven central:
 
 **Thrift support**:
 ```
-"com.intenthq.pucket" %% "pucket-thrift" % "1.4.0"
+"com.intenthq.pucket" %% "pucket-thrift" % "1.5.0"
 ```
 
 **Avro support**:
 ```
-"com.intenthq.pucket" %% "pucket-avro" % "1.4.0"
+"com.intenthq.pucket" %% "pucket-avro" % "1.5.0"
 ```
 
 **Spark connectors**:
 ```
-"com.intenthq.pucket" %% "pucket-spark" % "1.4.0"
+"com.intenthq.pucket" %% "pucket-spark" % "1.5.0"
 ```
 
 **MapReduce integration**:
 ```
-"com.intenthq.pucket" %% "pucket-mapreduce" % "1.4.0"
+"com.intenthq.pucket" %% "pucket-mapreduce" % "1.5.0"
 ```
 
 These dependencies should be combined depending on your usages; for example if you use Thrift and Spark then use the following:
 
 ```
-"com.intenthq.pucket" %% "pucket-thrift" % "1.4.0"
-"com.intenthq.pucket" %% "pucket-spark" % "1.4.0"
+"com.intenthq.pucket" %% "pucket-thrift" % "1.5.0"
+"com.intenthq.pucket" %% "pucket-spark" % "1.5.0"
 ```
 
 

build.sbt

@@ -1,5 +1,5 @@
-import com.github.bigtoast.sbtthrift.ThriftPlugin
 import sbt.ExclusionRule
+import com.intenthq.sbt.ThriftPlugin._
 import com.typesafe.sbt.SbtGit.GitKeys._
 
 val specs2Ver = "3.8.6"
@@ -32,7 +32,7 @@ val pomInfo = (
 
 lazy val commonSettings = Seq(
   organization := "com.intenthq.pucket",
-  version := "1.4.0",
+  version := "1.5.0",
   scalaVersion := "2.11.8",
   publishArtifact in Test := false,
   pomIncludeRepository := { _ => false },
@@ -115,14 +115,16 @@ lazy val spark = (project in file("spark")).
   ).dependsOn(core % "compile->compile;test->test", mapreduce % "compile->compile;test->test")
 
 lazy val thrift = (project in file("thrift")).
-  settings(ThriftPlugin.thriftSettings: _*).
+  enablePlugins(ThriftPlugin).
   settings(commonSettings: _*).
   settings(
     name := "pucket-thrift",
     libraryDependencies ++= Seq(
-      "org.apache.thrift" % "libthrift" % "0.9.3",
+      "org.apache.thrift" % "libthrift" % "0.10.0",
       "org.apache.parquet" % "parquet-thrift" % parquetVer
-    )
+    ),
+    thriftSourceDir in Thrift <<= sourceDirectory { _ / "test" / "thrift" },
+    thriftOutputDir in Thrift <<= sourceManaged { _ / "test" }
   ).dependsOn(core % "compile->compile;test->test", mapreduce % "test->test", spark % "test->test")
 
 

project/plugins.sbt

@@ -1,7 +1,7 @@
 resolvers += "bigtoast-github" at "http://bigtoast.github.com/repo/"
 
 addSbtPlugin("com.cavorite" % "sbt-avro-1-7" % "1.1.2")
-addSbtPlugin("com.github.bigtoast" % "sbt-thrift" % "0.7")
+addSbtPlugin("com.intenthq.sbt" % "sbt-thrift-plugin" % "1.0.5")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.0")