From a737d5f70ccde8a2af030f967db8f599d736e594 Mon Sep 17 00:00:00 2001 From: Nicholas Rutherford Date: Thu, 22 May 2014 18:03:39 +0200 Subject: [PATCH 1/2] Update rebar.config fix build error with lager version mismatch --- rebar.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index 418a896..eded011 100644 --- a/rebar.config +++ b/rebar.config @@ -1,9 +1,9 @@ {sub_dirs, ["rel"]}. {deps, [ - {lager, "2.0", {git, "git://github.com/basho/lager", {tag, "2.0.0"}}}, - {riak_core, ".*", {git, "git://github.com/basho/riak_core", {tag, "develop"}}}, + {lager, "2.0", {git, "git://github.com/basho/lager", {tag, "2.0.3"}}}, + {riak_core, ".*", {git, "git://github.com/basho/riak_core", {tag, "2.0.0beta1"}}}, {riak_dt, ".*", {git, "git://github.com/basho/riak_dt", {tag, "develop"}}} ]}. -{erl_opts, [debug_info, warnings_as_errors, {parse_transform, lager_transform}]}. \ No newline at end of file +{erl_opts, [debug_info, warnings_as_errors, {parse_transform, lager_transform}]}. From a32b71ea3ff2f7ca0a91db98021d700d64a017c0 Mon Sep 17 00:00:00 2001 From: Nicholas Rutherford Date: Fri, 23 May 2014 15:20:56 +0200 Subject: [PATCH 2/2] Makefile: make compile wait for get-deps #2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 685f75f..d2bc8ec 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ REBAR = $(shell pwd)/rebar all: deps compile -compile: +compile: deps $(REBAR) compile deps: