diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-05-08 22:07:46 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-05-08 22:07:46 -0400 |
| commit | eb1dec19c7233d02fe3b73f2bc8e25318ac42c0f (patch) | |
| tree | a9ff15ec26854c3b43e87fdcbe019e4d19ac4143 | |
| parent | 6bc5af5479cff211cc4ad4061b61d00c697ddd2b (diff) | |
| parent | 4e5bc6056f7865d7ebe920a5c55684f5f7d414af (diff) | |
Merge pull request #404 from tsloughter/master
update mustache to v0.3.0 and relx to current master ref
| -rw-r--r-- | rebar.config | 26 | ||||
| -rw-r--r-- | rebar.lock | 10 | ||||
| -rw-r--r-- | src/rebar_templater.erl | 2 |
3 files changed, 29 insertions, 9 deletions
diff --git a/rebar.config b/rebar.config index 876f725..5eaf6de 100644 --- a/rebar.config +++ b/rebar.config @@ -9,11 +9,11 @@ {git, "https://github.com/tsloughter/providers.git", {tag, "v1.3.1"}}}, {relx, "", - {git, "https://github.com/tsloughter/relx.git", - {branch, "mustache"}}}, + {git, "https://github.com/erlware/relx.git", + {tag, "v2.0.0"}}}, {mustache, ".*", {git, "https://github.com/soranoba/mustache.git", - {branch, "master"}}}, + {tag, "v0.3.0"}}}, {getopt, "", {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}}]}. @@ -51,5 +51,21 @@ ]}. %% Overrides -{overrides, [{override, erlware_commons, [{deps, []}, {plugins, []}]}, - {override, mustache, [{deps, []}, {plugins, []}]}]}. +{overrides, [{override, erlware_commons, [ + {erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, + {platform_define, "^R1[4|5]", deprecated_crypto}, + no_debug_info, + warnings_as_errors]}, + {deps, []}, {plugins, []} + ]}, + {override, mustache, [ + {erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, + no_debug_info]}, + {deps, []}, {plugins, []}]}, + {override, getopt, [{erl_opts, [no_debug_info]}]}, + {override, providers, [{erl_opts, [no_debug_info]}]}, + {override, relx, [{erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, + {platform_define, "^R1[4|5]", deprecated_crypto}, + no_debug_info, + warnings_as_errors]}]} + ]}. @@ -1,10 +1,14 @@ -[{<<"providers">>, +[{<<"relx">>, + {git,"https://github.com/erlware/relx.git", + {ref,"2e59b1c95575b3c104cc191e954c82baadc43c6c"}}, + 0}, + {<<"providers">>, {git,"https://github.com/tsloughter/providers.git", {ref,"7563ba7e916d5a35972b25b3aa1945ffe0a8e7a5"}}, 0}, {<<"mustache">>, - {git,"https://github.com/tsloughter/mustache.git", - {ref,"fe99ec4fcc4cf3f169d4851b4d1b7b5780b8d464"}}, + {git,"https://github.com/soranoba/mustache.git", + {ref,"e5401042c66039eef20ee81abc1537ced1f22bc7"}}, 0}, {<<"getopt">>, {git,"https://github.com/jcomellas/getopt.git", diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl index c5cec9f..353fa36 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). + mustache:render(ec_cnv:to_binary(Bin), Context, [{key_type, atom}]). |