From 860df96cd58418a884ec8eb0248920413fcce9cf Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 19 Sep 2015 17:08:06 -0500
Subject: [PATCH 1/2] update erlware_commons

---
 rebar.config        | 2 +-
 rebar.lock          | 2 +-
 src/rebar_utils.erl | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index e2b7a43a..19c59a74 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,7 @@
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 ft=erlang et
 
-{deps, [{erlware_commons,     "0.15.0"},
+{deps, [{erlware_commons,     "0.16.0"},
         {ssl_verify_hostname, "1.0.5"},
         {certifi,             "0.1.1"},
         {providers,           "1.5.0"},
diff --git a/rebar.lock b/rebar.lock
index 5d872c5b..eb95423e 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,6 +1,6 @@
 [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.4">>},0},
  {<<"certifi">>,{pkg,<<"certifi">>,<<"0.1.1">>},0},
- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.15.0">>},0},
+ {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.16.0">>},0},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0},
  {<<"providers">>,{pkg,<<"providers">>,<<"1.5.0">>},0},
  {<<"relx">>,{pkg,<<"relx">>,<<"3.5.0">>},0},
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index a90a18b4..ccdf960e 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -592,6 +592,8 @@ vcs_vsn(Vcs, Dir, Resources) ->
     end.
 
 %% Temp work around for repos like relx that use "semver"
+vcs_vsn_cmd(Vsn, _, _) when is_binary(Vsn) ->
+    {plain, Vsn};
 vcs_vsn_cmd(VCS, Dir, Resources) when VCS =:= semver ; VCS =:= "semver" ->
     vcs_vsn_cmd(git, Dir, Resources);
 vcs_vsn_cmd({cmd, _Cmd}=Custom, _, _) ->

From 40d7350ee8820b518860549d645ec69c837a7fba Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 19 Sep 2015 18:43:16 -0500
Subject: [PATCH 2/2] update relx

---
 rebar.config | 2 +-
 rebar.lock   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index 19c59a74..7b46ec26 100644
--- a/rebar.config
+++ b/rebar.config
@@ -7,7 +7,7 @@
         {providers,           "1.5.0"},
         {getopt,              "0.8.2"},
         {bbmustache,          "1.0.4"},
-        {relx,                "3.5.0"}]}.
+        {relx,                "3.6.0"}]}.
 
 {escript_name, rebar3}.
 {escript_emu_args, "%%! +sbtu +A0\n"}.
diff --git a/rebar.lock b/rebar.lock
index eb95423e..96af34fb 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -3,5 +3,5 @@
  {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.16.0">>},0},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0},
  {<<"providers">>,{pkg,<<"providers">>,<<"1.5.0">>},0},
- {<<"relx">>,{pkg,<<"relx">>,<<"3.5.0">>},0},
+ {<<"relx">>,{pkg,<<"relx">>,<<"3.6.0">>},0},
  {<<"ssl_verify_hostname">>,{pkg,<<"ssl_verify_hostname">>,<<"1.0.5">>},0}].