From 055fa5b63996967776cdc03f3c6ea486e4c6fa4b Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Mon, 3 Nov 2014 17:04:08 -0600
Subject: update config deps and support semver in app vsn

---
 rebar.config        | 18 +++++++++++-------
 src/rebar_utils.erl |  3 +++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/rebar.config b/rebar.config
index 0014c3a..e2838ab 100644
--- a/rebar.config
+++ b/rebar.config
@@ -27,13 +27,17 @@
   {platform_define, "^[0-9]+", namespaced_types}
  ]}.
 
-{deps, [{providers, "",
-         {git, "https://github.com/tsloughter/providers.git",
-          {branch, "format_error"}}},
-        {relx, "",
-         {git, "https://github.com/tsloughter/relx.git",
-          {branch, "format_error2"}}},
-        {getopt, "", {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}}]}.
+{deps, [
+       {erlware_commons, ".*",
+        {git, "https://github.com/erlware/erlware_commons.git",
+         {branch, "master"}}},
+       {providers, "",
+        {git, "https://github.com/tsloughter/providers.git",
+         {branch, "master"}}},
+       {relx, "",
+        {git, "https://github.com/tsloughter/relx.git",
+         {branch, "ec_git_vsn"}}},
+       {getopt, "", {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}}]}.
 
 {erlydtl_opts, [{doc_root, "priv/templates"},
                 {compiler_options, [report, return, debug_info]}]}.
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 4815ad2..ae1d126 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -473,6 +473,9 @@ vcs_vsn_1(Vcs, Dir) ->
             end
     end.
 
+%% Temp work around for repos like relx that use "semver"
+vcs_vsn_cmd(VCS, Dir) when VCS =:= semver ; VCS =:= "semver" ->
+    rebar_git_resource:make_vsn(Dir);
 vcs_vsn_cmd(VCS, Dir) when VCS =:= git ; VCS =:= "git" ->
     rebar_git_resource:make_vsn(Dir);
 vcs_vsn_cmd(VCS, Dir) when VCS =:= pkg ; VCS =:= "pkg" ->
-- 
cgit v1.1