From 9ad84ac8f93756610fc99fe6a8eb3412218478aa Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 21 Jun 2015 14:55:41 -0500
Subject: use packages and add hex package metadata to .app.src

---
 src/relx.app.src | 6 +++++-
 src/rlx_util.erl | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/relx.app.src b/src/relx.app.src
index 3e2b493..d54a7bf 100644
--- a/src/relx.app.src
+++ b/src/relx.app.src
@@ -23,4 +23,8 @@
   {vsn, "semver"},
   {modules, []},
   {registered, []},
-  {applications, [kernel, stdlib, getopt, erlware_commons, providers]}]}.
+  {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),
-- 
cgit v1.2.3


From d73464f478725f7e4147f6b352b7af47b1017c1f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 21 Jun 2015 15:01:49 -0500
Subject: update travis and version bump 2.1.0

---
 src/relx.app.src | 41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/relx.app.src b/src/relx.app.src
index d54a7bf..146f138 100644
--- a/src/relx.app.src
+++ b/src/relx.app.src
@@ -1,30 +1,11 @@
-%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 80 -*-
-%%
-%% @author Eric Merritt <ericbmerritt@gmail.com>
-%% @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, bbmustache, providers]},
-
-  {contributors, ["Eric Merritt", "Tristan Sloughter", "Jordan Wilberding"]},
-  {licenses, ["Apache"]},
-  {links, [{"Github", "https://github.com/erlware/relx"}]}]}.
+{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"}]}]}.
-- 
cgit v1.2.3