Skip to content

Commit

Permalink
Merge pull request #243 from inaka/elbrujohalcon.243.make_it_compatib…
Browse files Browse the repository at this point in the history
…le_with_otp19

Make it compatible with OTP19
  • Loading branch information
Brujo Benavides authored Jun 28, 2016
2 parents 7a670e3 + 1f13203 commit 905ab1d
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 53 deletions.
1 change: 1 addition & 0 deletions .awconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
---
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Mnesia*
.awconfig
ebin
deps
doc
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ BUILD_DEPS = inaka_mk hexer_mk
DEP_PLUGINS = inaka_mk hexer_mk

dep_sync = git https://github.com/rustyio/sync.git 11df81d
dep_lager = git https://github.com/basho/lager.git 3.1.0
dep_worker_pool = git https://github.com/inaka/worker_pool.git 1.0.4
dep_uuid = git https://github.com/okeuday/uuid.git v1.5.1
dep_lager = git https://github.com/basho/lager.git 3.2.1
dep_worker_pool = hex 2.0.1
dep_uuid = git https://github.com/okeuday/uuid.git v1.5.2-rc1
dep_inaka_mk = git https://github.com/inaka/inaka.mk 1.0.0
dep_hexer_mk = git https://github.com/inaka/hexer.mk 1.1.0
dep_katana_test = git https://github.com/inaka/katana-test.git 0.0.4
Expand All @@ -21,7 +21,7 @@ CT_SUITES ?= conditional_logic sumo_basic sumo_events sumo_meta

include erlang.mk

LOCAL_DEPS := tools common_test crypto test_server mnesia
LOCAL_DEPS := tools common_test crypto mnesia

ERLC_OPTS := +'{parse_transform, lager_transform}'
ERLC_OPTS += +warn_unused_vars +warn_export_all +warn_shadow_vars +warn_unused_import +warn_unused_function
Expand Down
4 changes: 0 additions & 4 deletions elvis.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
{elvis_style, invalid_dynamic_call, disable}],
ruleset => erl_files
},
#{dirs => ["."],
filter => "Makefile",
ruleset => makefiles
},
#{dirs => ["."],
filter => "rebar.config",
ruleset => rebar_config
Expand Down
Loading

0 comments on commit 905ab1d

Please sign in to comment.