From a504a6adfcbaa9f3d7f5052cc37b8b83522ab822 Mon Sep 17 00:00:00 2001 From: Jesse Gumm Date: Thu, 5 Nov 2015 11:31:38 -0600 Subject: [PATCH] Update rebar.config back to choptastic/erlang_localtime *temporary* until a commit is merged --- .gitignore | 1 + Makefile | 3 +++ rebar.config | 7 ++++--- src/qdate.app.src | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 49830e4..47010b0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ deps/ ebin/ .eunit/ _build +rebar.lock diff --git a/Makefile b/Makefile index 2eb16b7..e94d5d0 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: compile compile: $(REBAR) compile +update: + $(REBAR) update + test: compile $(REBAR) eunit diff --git a/rebar.config b/rebar.config index f4a731f..34c0671 100644 --- a/rebar.config +++ b/rebar.config @@ -1,7 +1,5 @@ %% -*- erlang -*- %% vim:ts=4 sw=4 et ft=erlang -{require_otp_vsn, "R13B04|R14|R15|R16|17|18"}. - {cover_enabled, true}. %% For rebar2 compat @@ -12,7 +10,10 @@ %% breakage. {erlware_commons, ".*", {git, "git://github.com/erlware/erlware_commons.git", {tag, "v0.15.0"}}}, - {erlang_localtime, ".*", {git, "git://github.com/dmitryme/erlang_localtime.git", {branch, master}}} + %% We'll temporarily still use choptastic/erlang_localtime until + %% https://github.com/dmitryme/erlang_localtime/pull/24 gets merged. Then we + %% can switch to the mainline repo + {erlang_localtime, ".*", {git, "git://github.com/choptastic/erlang_localtime.git", {branch, master}}} ]}. %% for rebar3 diff --git a/src/qdate.app.src b/src/qdate.app.src index 4c37fdd..1c522ce 100644 --- a/src/qdate.app.src +++ b/src/qdate.app.src @@ -1,7 +1,7 @@ {application, qdate, [ {description, "Simple Date and Timezone handling for Erlang"}, - {vsn, "0.4.1"}, + {vsn, "0.4.2"}, {registered, []}, {applications, [ kernel,