Skip to content

Commit

Permalink
Upgraded to rebar3
Browse files Browse the repository at this point in the history
  • Loading branch information
tolbrino committed Oct 25, 2018
1 parent ccb1741 commit 266ba93
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 31 deletions.
17 changes: 8 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,30 @@ all: deps compile xref test
ci: deps compile xref dialyzer test

deps:
rebar get-deps
rebar3 upgrade

compile:
rebar compile
rebar3 compile

clean: clean_plt
rebar clean
rebar3 clean

clean-all: clean
rm -rf deps

test:
ERL_LIBS=./examples rebar ct skip_deps=true
ERL_LIBS=./examples rebar3 ct skip_deps=true

xref:
ERL_LIBS=./deps rebar xref skip_deps=true
ERL_LIBS=./deps rebar3 xref skip_deps=true

edown_deps:
rebar get-deps compile edown=true
rebar3 do upgrade compile edown=true

doc: edown_deps
rebar doc edown=true skip_deps=true
rebar3 edoc edown=true skip_deps=true

$(EXOMETER_PLT):
rebar get-deps compile
$(EXOMETER_PLT): deps compile
ERL_LIBS=deps dialyzer --build_plt --output_plt $(EXOMETER_PLT) \
--apps $(DIALYZER_APPS) | \
fgrep -v -f ./dialyzer.ignore-warnings
Expand Down
10 changes: 5 additions & 5 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

{deps,
[
{parse_trans, ".*", {git, "git://github.com/uwiger/parse_trans.git", {tag, "3.2.0"}}},
{folsom, ".*", {git, "git://github.com/folsom-project/folsom", {tag, "0.8.5"}}},
{hut, ".*", {git, "git://github.com/tolbrino/hut.git", {tag, "v1.1.1"}}},
{setup, ".*", {git, "git://github.com/uwiger/setup.git", {tag, "2.0.2"}}}
{parse_trans, "3.2.0"},
{folsom, "0.8.5"},
{hut, "1.2.0"},
{setup, "2.0.2"}
]}.

{profiles,
[
{test, [{deps, [{meck, {git, "git://github.com/eproxus/meck.git", {tag,"0.8.4"}}}]}]},
{test, [{deps, [{meck, "0.8.4"}]}]},
{docs, [{deps, [{edown, {git, "git://github.com/uwiger/edown.git", {branch, "master"}}}]}]}
]}.

Expand Down
20 changes: 4 additions & 16 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
[{<<"bear">>,{pkg,<<"bear">>,<<"0.8.5">>},1},
{<<"folsom">>,
{git,"git://github.com/folsom-project/folsom",
{ref,"0948c5f7a2221cc7c4975d042b13c84bb9387517"}},
0},
{<<"hut">>,
{git,"git://github.com/tolbrino/hut.git",
{ref,"025540398478ab6f95932c3234382ac5bb21ad3e"}},
0},
{<<"parse_trans">>,
{git,"git://github.com/uwiger/parse_trans.git",
{ref,"f22fbf4982bc541518d4a9b3ad305810460724e5"}},
0},
{<<"setup">>,
{git,"git://github.com/uwiger/setup.git",
{ref,"eda3352e7555b9faf42b5242d95fc386bccbe123"}},
0}].
{<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.5">>},0},
{<<"hut">>,{pkg,<<"hut">>,<<"1.2.0">>},0},
{<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.2.0">>},0},
{<<"setup">>,{pkg,<<"setup">>,<<"2.0.2">>},0}].
2 changes: 1 addition & 1 deletion src/exometer_core.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{application, exometer_core,
[
{description, "Code instrumentation and metrics collection package."},
{vsn, "1.5.3"},
{vsn, "1.5.4"},
{registered, []},
{applications,
[
Expand Down

0 comments on commit 266ba93

Please sign in to comment.