Skip to content

Commit

Permalink
Merge pull request #43 from inaka/elbrujohalcon.43.switch_build_tools…
Browse files Browse the repository at this point in the history
…_to_erlang_m

Switch build tools to erlang.mk and republish to hex.pm
  • Loading branch information
Brujo Benavides committed Jan 14, 2016
2 parents b6a6b57 + f2c8b1c commit 7b1ac8e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
hexer.config
tirerl.d
.erlang.mk/
.eunit
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
**Merged pull requests:**

- \[\#40\] Fix for rebar.config dependency \(changed to rustyio/sync\) [\#42](https://github.com/inaka/tirerl/pull/42) ([nazar256](https://github.com/nazar256))
- Hex Package [\#41](https://github.com/inaka/tirerl/pull/41) ([elbrujohalcon](https://github.com/elbrujohalcon))
- \[Closes \#39\] Update erlang.mk so that dialyzer doesn't fail [\#40](https://github.com/inaka/tirerl/pull/40) ([jfacorro](https://github.com/jfacorro))
- Make sure all uris start with / [\#38](https://github.com/inaka/tirerl/pull/38) ([elbrujohalcon](https://github.com/elbrujohalcon))
- \[\#1\] Fix docstrings to be able to generate erldocs [\#37](https://github.com/inaka/tirerl/pull/37) ([jfacorro](https://github.com/jfacorro))
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ dep_shotgun = hex 0.1.15
dep_worker_pool = hex 1.0.4
dep_sync = git https://github.com/rustyio/sync.git 475d728a
dep_mixer = git https://github.com/inaka/mixer.git 0.1.4
dep_katana = hex 0.2.18
dep_katana = hex 0.2.19
dep_inaka_mk = git https://github.com/inaka/inaka.mk.git 1.0.0
dep_hexer_mk = git https://github.com/inaka/hexer.mk.git 1.0.0
dep_hexer_mk = git https://github.com/inaka/hexer.mk.git 1.0.2

DEP_PLUGINS = inaka_mk hexer_mk

Expand Down
4 changes: 2 additions & 2 deletions src/tirerl.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[
{description,
"Erlang interface to Elastic Search"},
{vsn, "0.1.8"},
{vsn, "0.1.9"},
{applications,
[kernel,
stdlib,
Expand All @@ -16,6 +16,6 @@
{maintainers,["Inaka"]},
{licenses,["Apache 2.0"]},
{links,[{"Github","https://github.com/inaka/tirerl"}]},
{build_tools,["make", "rebar"]}
{build_tools,["erlang.mk", "rebar"]}
]
}.

0 comments on commit 7b1ac8e

Please sign in to comment.