Merge pull request #3 from AntidoteDB/otp21

Otp21 erlang

Author: albsch

rebar.config

@@ -3,13 +3,22 @@
 
 {deps, [
     {lager, "3.6.2"},
-    {riak_pb, ".*", {git, "git://github.com/syncfree/riak_pb", {tag, "v0.6.0"}}}
+    {riak_pb, ".*", {git, "git://github.com/syncfree/riak_pb", {tag, "v0.7.0"}}}
 ]}.
 
 {plugins, [
-  {protobuffs, {git, "git://github.com/basho/erlang_protobuffs.git", {tag, "0.9.0"}}}
-    ]}.
+ { meck, "0.8.12"},
+ { protobuffs, {git, "git://github.com/basho/erlang_protobuffs.git", {tag, "0.9.0"}}},
+ { rebar3_protobuffs_plugin, {git, "git://github.com/cmkarlsson/rebar3_protobuffs_plugin", {branch, "master"}}},
+ { riak_pb_msgcodegen, {git, "git://github.com/tsloughter/riak_pb_msgcodegen",
+    {branch, "master"}}}
+]}.
+{provider_hooks, [{pre, [{compile, {protobuffs, compile}},
+                        {clean, {protobuffs, clean}},
+                        {compile, riak_pb_msgcodegen}
+                       ]}]}.
 
 {erl_opts, [debug_info, warnings_as_errors, {parse_transform, lager_transform}]}.
 {cover_enabled, true}.
 {eunit_opts, [verbose, {report, {eunit_surefire, [{dir,"."}]}}]}.
+

rebar.lock

@@ -1,20 +1,18 @@
 {"1.1.0",
 [{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"lager">>,{pkg,<<"lager">>,<<"3.6.2">>},0},
- {<<"meck">>,
-  {git,"https://github.com/basho/meck.git",
-       {ref,"dde759050eff19a1a80fd854d7375174b191665d"}},
-  2},
+ {<<"meck">>,{pkg,<<"meck">>,<<"0.8.12">>},1},
  {<<"protobuffs">>,
   {git,"git://github.com/basho/erlang_protobuffs.git",
        {ref,"0dde9d3b37b7bec3a4dfb0e87684dd7039e169ab"}},
   1},
  {<<"riak_pb">>,
   {git,"git://github.com/syncfree/riak_pb",
-       {ref,"a0d45fdf5f09e96828cf3a4628ab6c7e2fe56bbc"}},
+       {ref,"c0bb7a89401d58c8d786e8af9ab30efcd3e6e092"}},
   0}]}.
 [
 {pkg_hash,[
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"lager">>, <<"2C72950A0E75FFD927DD35BC85EA30E7680A264C4BBD08B328250871AC456CC2">>}]}
+ {<<"lager">>, <<"2C72950A0E75FFD927DD35BC85EA30E7680A264C4BBD08B328250871AC456CC2">>},
+ {<<"meck">>, <<"1F7B1A9F5D12C511848FEC26BBEFD09A21E1432EADB8982D9A8ACEB9891A3CF2">>}]}
 ].