use bbmustache package

5 files changed, 9 insertions, 15 deletions

diff --git a/bootstrap b/bootstrap
index 1a3999b..e8d1d2e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -86,6 +86,7 @@ compile(App, FirstFiles) ->
     FirstFilesPaths = [filename:join([Dir, "src", Module]) || Module <- FirstFiles],
     Sources = FirstFilesPaths ++ filelib:wildcard(filename:join([Dir, "src", "*.erl"])),
     [compile_file(X, [{i, filename:join(Dir, "include")}
+                     ,debug_info
                      ,{outdir,  filename:join(Dir, "ebin")}
                      ,return | additional_defines()]) || X <- Sources].
 
diff --git a/rebar.config b/rebar.config
index d68f195..895c78b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,20 +2,12 @@
 %% ex: ts=4 sw=4 ft=erlang et
 
 {deps, [
-       {erlware_commons, "",
-        {git, "https://github.com/erlware/erlware_commons.git",
-         {branch, "master"}}},
-       {providers, "",
-        {git, "https://github.com/tsloughter/providers.git",
-         {tag, "v1.4.0"}}},
+       {erlware_commons, "0.12.0"},
+       {providers, "1.4.1"},
+       {getopt, "0.8.2"},
+       {bbmustache, "1.0.0"},
        {relx, "",
         {git, "https://github.com/erlware/relx.git",
-         {branch, "master"}}},
-       {mustache, ".*",
-         {git, "https://github.com/soranoba/mustache.git",
-          {tag, "v0.3.0"}}},
-       {getopt, "",
-        {git, "https://github.com/jcomellas/getopt.git",
          {branch, "master"}}}]}.
 
 {escript_name, rebar3}.
@@ -41,7 +33,6 @@
              {erl_opts, [debug_info]}
             ]},
 
-            %% We don't want erlydtl to attempt to run on the first compile pass to bootstrap
             {bootstrap, []}
            ]}.
 
diff --git a/rebar.lock b/rebar.lock
index 20c120f..b4781ae 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,4 +1,5 @@
-[{<<"relx">>,
+[{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.0">>},0},
+ {<<"relx">>,
   {git,"https://github.com/erlware/relx.git",
        {ref,"74fec3455ba6dbb7d9e369137c1b15ab10804993"}},
   0},
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 6d081a2..0ec0fcb 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -17,6 +17,7 @@
                   common_test,
                   erlware_commons,
                   providers,
+                  bbmustache,
                   relx,
                   inets]},
   {env, [
diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
index 353fa36..3aa6e90 100644
--- a/src/rebar_templater.erl
+++ b/src/rebar_templater.erl
@@ -380,4 +380,4 @@ write_file(Output, Data, Force) ->
 %% Render a binary to a string, using mustache and the specified context
 %%
 render(Bin, Context) ->
-    mustache:render(ec_cnv:to_binary(Bin), Context, [{key_type, atom}]).
+    bbmustache:render(ec_cnv:to_binary(Bin), Context, [{key_type, atom}]).