Skip to content

Commit

Permalink
Merge pull request #105 from inaka/dave.97.updated.for.hexer.hex.pack…
Browse files Browse the repository at this point in the history
…age.tool

[#97] Updated for hexer hex package tool
  • Loading branch information
Brujo Benavides committed Dec 30, 2015
2 parents 1eec2b0 + 3894271 commit 0600cc4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PROJECT = katana

DEPS = eper aleppo xref_runner elvis_core
DEPS = eper inaka_aleppo xref_runner elvis_core
SHELL_DEPS := sync
TEST_DEPS = mixer
LOCAL_DEPS := xmerl tools compiler syntax_tools common_test inets ssl test_server hipe public_key dialyzer wx

dep_eper = git https://github.com/massemanet/eper.git 0.96.3
dep_sync = git https://github.com/inaka/sync.git 0.1.3
dep_aleppo = git https://github.com/inaka/aleppo.git 0.9.2
dep_xref_runner = git https://github.com/inaka/xref_runner.git 0.2.3
dep_mixer = git https://github.com/inaka/mixer.git 0.1.4
dep_elvis_core = git https://github.com/inaka/elvis_core.git 0.2.6-alpha2
dep_eper = hex 0.94.0
dep_inaka_aleppo = hex 0.9.4
dep_xref_runner = hex 0.2.4
dep_inaka_mixer = hex 0.1.4
dep_elvis_core = git https://github.com/inaka/elvis_core.git 0.2.6-alpha2
dep_sync = git https://github.com/inaka/sync.git 0.1.3

include erlang.mk

Expand Down
4 changes: 3 additions & 1 deletion elvis.config
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#{dirs => ["."],
filter => "Makefile",
rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}},
{elvis_project, protocol_for_deps_erlang_mk, #{ignore => []}}]
{elvis_project, protocol_for_deps_erlang_mk, #{ regex => "(https://.*|[0-9]+([.][0-9]+)*)"}}]
},
#{dirs => ["."],
filter => "elvis.config",
Expand All @@ -51,3 +51,5 @@
]
}
].


2 changes: 1 addition & 1 deletion test/elvis.config
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#{dirs => ["../.."],
filter => "Makefile",
rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}},
{elvis_project, protocol_for_deps_erlang_mk, #{ignore => []}}]
{elvis_project, protocol_for_deps_erlang_mk, #{ regex => "(https://.*|[0-9]+([.][0-9]+)*)"}}]
},
#{dirs => ["../.."],
filter => "elvis.config",
Expand Down

0 comments on commit 0600cc4

Please sign in to comment.