From 266ba93b3ce440fcbdd4c9e0abcd0bc961a7dd99 Mon Sep 17 00:00:00 2001
From: Tino Breddin <t@tolbrino.com>
Date: Thu, 25 Oct 2018 17:36:45 +0200
Subject: [PATCH] Upgraded to rebar3

---
 Makefile                  | 17 ++++++++---------
 rebar.config              | 10 +++++-----
 rebar.lock                | 20 ++++----------------
 src/exometer_core.app.src |  2 +-
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 35b01dd..3a0ea01 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/rebar.config b/rebar.config
index 5b6591a..2c77b53 100644
--- a/rebar.config
+++ b/rebar.config
@@ -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"}}}]}]}
  ]}.
 
diff --git a/rebar.lock b/rebar.lock
index 29277e6..ccefbfc 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -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}].
diff --git a/src/exometer_core.app.src b/src/exometer_core.app.src
index 43570b7..dcc45c7 100644
--- a/src/exometer_core.app.src
+++ b/src/exometer_core.app.src
@@ -2,7 +2,7 @@
 {application, exometer_core,
  [
   {description, "Code instrumentation and metrics collection package."},
-  {vsn, "1.5.3"},
+  {vsn, "1.5.4"},
   {registered, []},
   {applications,
    [