Merge pull request #352 from tsloughter/pkg_deps

Use packages for deps and track version number directly

6 files changed, 26 insertions, 60 deletions

diff --git a/.travis.yml b/.travis.yml
index 84eddbc..0dfe502 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ otp_release:
   - 17.0
   - R16B03-1
   - R15B03
-script: "./rebar3 ct"
+script: "./rebar3 update && ./rebar3 ct"
 branches:
   only:
     - master
diff --git a/rebar.config b/rebar.config
index 4ff2aa4..b62fc7e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,22 +1,15 @@
 %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*-
 %% Dependencies ================================================================
-{deps, [{erlware_commons, ".*",
-         {git, "https://github.com/erlware/erlware_commons.git",
-          {branch, "master"}}},
-        {providers, ".*",
-         {git, "https://github.com/tsloughter/providers.git",
-          {tag, "v1.3.0"}}},
-        {mustache, ".*",
-         {git, "https://github.com/soranoba/mustache.git",
-          {tag, "v0.3.0"}}},
-        {getopt, "",
-         {git, "https://github.com/jcomellas/getopt.git",
-          {branch, "master"}}}]}.
+{deps, [{erlware_commons, "0.12.0"},
+        {providers, "1.4.1"},
+        {getopt, "0.8.2"},
+        {bbmustache, "1.0.1"}
+       ]}.
 
 {escript_incl_extra, [{"priv/templates/*", "."}]}.
 {escript_emu_args, "%%! +sbtu +A0 -noinput\n"}.
 {escript_incl_apps,
- [getopt, erlware_commons, providers, relx]}.
+ [getopt, erlware_commons, bbmustache, providers, relx]}.
 
 %% Compiler Options ============================================================
 {erl_opts,
@@ -47,9 +40,9 @@
                                                     ]},
                                          {deps, []}, {plugins, []}
                                          ]},
-            {override, mustache, [
-                                 {erl_opts, [no_debug_info]},
-                                 {deps, []}, {plugins, []}]},
+            {override, bbmustache, [
+                                   {erl_opts, [no_debug_info]},
+                                   {deps, []}, {plugins, []}]},
             {override, getopt, [{erl_opts, [no_debug_info]}]},
             {override, providers, [{erl_opts, [no_debug_info]}]}
             ]}.
diff --git a/rebar.lock b/rebar.lock
index 9d11226..4775b62 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,16 +1,4 @@
-[{<<"providers">>,
-  {git,"https://github.com/tsloughter/providers.git",
-       {ref,"d565693cbbca3457df34d95c53c47e1faa8cde6c"}},
-  0},
- {<<"mustache">>,
-  {git,"https://github.com/soranoba/mustache.git",
-       {ref,"e5401042c66039eef20ee81abc1537ced1f22bc7"}},
-  0},
- {<<"getopt">>,
-  {git,"https://github.com/jcomellas/getopt.git",
-       {ref,"626698975e63866156159661d100785d65eab6f9"}},
-  0},
- {<<"erlware_commons">>,
-  {git,"https://github.com/erlware/erlware_commons.git",
-       {ref,"ef0d252b11c863f9c228af2fe93a4e42fba2f7f3"}},
-  0}].
+[{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.1">>},0},
+ {<<"providers">>,{pkg,<<"providers">>,<<"1.4.1">>},0},
+ {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.12.0">>},0},
+ {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}].
diff --git a/rebar3 b/rebar3
index 513bcf3..404d9a5 100755
--- a/rebar3
+++ b/rebar3
diff --git a/src/relx.app.src b/src/relx.app.src
index 3e2b493..146f138 100644
--- a/src/relx.app.src
+++ b/src/relx.app.src
@@ -1,26 +1,11 @@
-%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 80 -*-
-%%
-%% @author Eric Merritt <[email protected]>
-%% @copyright Erlware, Inc.
-%%
-%% This file is provided to you under the Apache License,
-%% Version 2.0 (the "License"); you may not use this file
-%% except in compliance with the License.  You may obtain
-%% a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied.  See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
-{application, relx,
- [{description, "Release assembler for Erlang/OTP Releases"},
-  {vsn, "semver"},
-  {modules, []},
-  {registered, []},
-  {applications, [kernel, stdlib, getopt, erlware_commons, providers]}]}.
+{application,relx,
+             [{description,"Release assembler for Erlang/OTP Releases"},
+              {vsn,"2.1.0"},
+              {modules,[]},
+              {registered,[]},
+              {applications,[kernel,stdlib,getopt,erlware_commons,bbmustache,
+                             providers]},
+              {contributors,["Eric Merritt","Tristan Sloughter",
+                             "Jordan Wilberding"]},
+              {licenses,["Apache"]},
+              {links,[{"Github","https://github.com/erlware/relx"}]}]}.
diff --git a/src/rlx_util.erl b/src/rlx_util.erl
index db448e8..f732055 100644
--- a/src/rlx_util.erl
+++ b/src/rlx_util.erl
@@ -162,7 +162,7 @@ render(Template) ->
     render(Template, []).
 
 render(Template, Data) ->
-    {ok, mustache:render(ec_cnv:to_binary(Template), Data, [{key_type, atom}])}.
+    {ok, bbmustache:render(ec_cnv:to_binary(Template), Data, [{key_type, atom}])}.
 
 load_file(Files, escript, Name) ->
     {Name, Bin} = lists:keyfind(Name, 1, Files),