Skip to content

Commit

Permalink
Upgrade all the deps
Browse files Browse the repository at this point in the history
Use rebar3_lfe_compile-0.6.0, lfe-1.1.1 and ltest-0.9.0.

Ensure the `test` targets play nice with modern rebar3
by using `-m` and some Makefile hacks.
  • Loading branch information
yurrriq committed Sep 18, 2016
1 parent 138ad78 commit 1d4ed26
Show file tree
Hide file tree
Showing 95 changed files with 535 additions and 387 deletions.
8 changes: 7 additions & 1 deletion exercises/accumulate/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/accumulate/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
6 changes: 6 additions & 0 deletions exercises/accumulate/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"1.1.0",
[{<<"lfe">>,{pkg,<<"lfe">>,<<"1.1.1">>},0}]}.
[
{pkg_hash,[
{<<"lfe">>, <<"F57D2D705AB239CE171318DD31F4E374558266A88E1435F91045C1E8A2965D9C">>}]}
].
8 changes: 7 additions & 1 deletion exercises/allergies/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/allergies/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
6 changes: 6 additions & 0 deletions exercises/allergies/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"1.1.0",
[{<<"lfe">>,{pkg,<<"lfe">>,<<"1.1.1">>},0}]}.
[
{pkg_hash,[
{<<"lfe">>, <<"F57D2D705AB239CE171318DD31F4E374558266A88E1435F91045C1E8A2965D9C">>}]}
].
8 changes: 7 additions & 1 deletion exercises/anagram/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/anagram/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
4 changes: 4 additions & 0 deletions exercises/anagram/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[{<<"lfe">>,
{git,"git://github.com/rvirding/lfe.git",
{ref,"cd96efc3d2a73ecff7f3e2ef3563b73b098e4844"}},
0}].
8 changes: 7 additions & 1 deletion exercises/atbash-cipher/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/atbash-cipher/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
6 changes: 6 additions & 0 deletions exercises/atbash-cipher/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"1.1.0",
[{<<"lfe">>,{pkg,<<"lfe">>,<<"1.1.1">>},0}]}.
[
{pkg_hash,[
{<<"lfe">>, <<"F57D2D705AB239CE171318DD31F4E374558266A88E1435F91045C1E8A2965D9C">>}]}
].
8 changes: 7 additions & 1 deletion exercises/bank-account/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/bank-account/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
6 changes: 6 additions & 0 deletions exercises/bank-account/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"1.1.0",
[{<<"lfe">>,{pkg,<<"lfe">>,<<"1.1.1">>},0}]}.
[
{pkg_hash,[
{<<"lfe">>, <<"F57D2D705AB239CE171318DD31F4E374558266A88E1435F91045C1E8A2965D9C">>}]}
].
8 changes: 7 additions & 1 deletion exercises/beer-song/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/beer-song/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
6 changes: 6 additions & 0 deletions exercises/beer-song/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"1.1.0",
[{<<"lfe">>,{pkg,<<"lfe">>,<<"1.1.1">>},0}]}.
[
{pkg_hash,[
{<<"lfe">>, <<"F57D2D705AB239CE171318DD31F4E374558266A88E1435F91045C1E8A2965D9C">>}]}
].
8 changes: 7 additions & 1 deletion exercises/binary/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/binary/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
6 changes: 6 additions & 0 deletions exercises/binary/rebar.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"1.1.0",
[{<<"lfe">>,{pkg,<<"lfe">>,<<"1.1.1">>},0}]}.
[
{pkg_hash,[
{<<"lfe">>, <<"F57D2D705AB239CE171318DD31F4E374558266A88E1435F91045C1E8A2965D9C">>}]}
].
8 changes: 7 additions & 1 deletion exercises/bob/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ERL := $(shell which erl)
REBAR3 := $(shell which rebar3)

null :=
space := $(null) #
comma := ,

ifeq ($(ERL),)
$(error Can't find Erlang executable 'erl')
else ifeq ($(REBAR3),)
Expand All @@ -12,4 +16,6 @@ compile: ; $(REBAR3) compile
clean: ; $(REBAR3) clean

.PHONY: test
test: ; $(REBAR3) eunit
test:
$(REBAR3) eunit \
-m $(subst $(space),$(comma),$(basename $(notdir $(wildcard test/*.lfe))))
15 changes: 4 additions & 11 deletions exercises/bob/rebar.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{plugins,
[{'lfe-compile',
{git, "git://github.com/lfe-rebar3/compile.git",
{tag, "0.3.0"}}}]}.
{plugins, [{'lfe-compile', "0.6.0", {pkg, rebar3_lfe_compile}}]}.

{provider_hooks,
[{pre, [{compile, {lfe, compile}}]}]}.
{provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

{deps,
[{lfe,
{git, "git://github.com/rvirding/lfe.git",
{tag, "1.0"}}}]}.
{deps, [{lfe, "1.1.1"}]}.

{profiles,
[{test,
[{eunit_compile_opts, [{src_dirs, ["src", "test"]}]},
{deps,
[{ltest,
{git, "git://github.com/lfex/ltest.git",
{tag, "0.8.0"}}}]}]}]}.
{tag, "0.9.0"}}}]}]}]}.
Loading

0 comments on commit 1d4ed26

Please sign in to comment.