Permalink
Browse files

Merge pull request #11 from mrallen1/mra-rebar3

Bump lager dependency; support rebar3 and 2
  • Loading branch information...
jlouis committed Jun 14, 2017
2 parents 3534aa8 + 9886be2 commit c8235c6ca1deffeccdbba9dd74263408ed56594a
Showing with 26 additions and 14 deletions.
  1. +2 −2 Makefile
  2. +1 −2 rebar.config
  3. +10 −0 rebar.config.script
  4. +8 −8 rebar.lock
  5. +5 −2 src/safetyvalve.app.src
View
@@ -4,7 +4,7 @@ REBAR = rebar3
ERLC_OPTS = +debug_info '+{parse_transform, lager_transform}'
DEPS = lager
-dep_lager = http://github.com/basho/lager.git 2.0.3
+dep_lager = https://github.com/erlang-lager/lager.git 3.5.0
include erlang.mk
@@ -13,4 +13,4 @@ eqc-ci: all
.PHONY: rebar3-compile
rebar3-compile:
- $(REBAR) compile | sed -e 's|_build/default/lib/safetyvalve/||'
+ $(REBAR) compile | sed -e 's|_build/default/lib/safetyvalve/||'
View
@@ -1,8 +1,7 @@
-{require_otp_vsn, "R15|R16|(17.*)|(18.*)"}.
{erl_opts, [debug_info,
{parse_transform, lager_transform}]}.
{deps, [
- {lager, ".*", {git, "https://github.com/basho/lager.git", {tag, "2.1.0"}}}
+ lager
]}.
View
@@ -0,0 +1,10 @@
+case erlang:function_exported(rebar3, main, 1) of
+ true -> % rebar3
+ CONFIG;
+ false -> % rebar 2.x or older
+ %% Rebuild deps, possibly including those that have been moved to
+ %% profiles
+ [{deps, [
+ {lager, ".*", {git, "https://github.com/erlang-lager/lager.git", {tag, "3.5.0"}}}
+ ]} | lists:keydelete(deps, 1, CONFIG)]
+end.
View
@@ -1,8 +1,8 @@
-[{<<"goldrush">>,
- {git,"git://github.com/DeadZen/goldrush.git",
- {ref,"71e63212f12c25827e0c1b4198d37d5d018a7fec"}},
- 1},
- {<<"lager">>,
- {git,"https://github.com/basho/lager.git",
- {ref,"840acab51ebfb731de0137d9c6d41e7db4a12793"}},
- 0}].
+{"1.1.0",
+[{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
+ {<<"lager">>,{pkg,<<"lager">>,<<"3.5.0">>},0}]}.
+[
+{pkg_hash,[
+ {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
+ {<<"lager">>, <<"C7D35985D784CCE9F8FA4056023CE873252B68BC31A81C63E4286857713DD6CE">>}]}
+].
View
@@ -8,7 +8,10 @@
stdlib,
lager
]},
- {modules, []},
+ {modules, []},
{mod, { safetyvalve_app, []}},
- {env, []}
+ {env, []},
+ {maintainers, ["Jesper Louis Andersen"]},
+ {licenses, ["Apache 2"]},
+ {links, [{"Github", "https://github.com/jlouis/safetyvalve"}]}
]}.

0 comments on commit c8235c6

Please sign in to comment.