Merge pull request #111 from inaka/elbrujohalcon.111.switch_build_too…

…ls_to_erlang_m

Switch build tools to erlang.mk and republish to hex.pm

CHANGELOG.md

@@ -1,10 +1,21 @@
 # Change Log
 
-## [0.2.16](https://github.com/inaka/erlang-katana/tree/0.2.16) (2015-12-30)
-[Full Changelog](https://github.com/inaka/erlang-katana/compare/0.2.15...0.2.16)
+## [0.2.18](https://github.com/inaka/erlang-katana/tree/0.2.18) (2015-12-31)
+[Full Changelog](https://github.com/inaka/erlang-katana/compare/0.2.17...0.2.18)
+
+## [0.2.17](https://github.com/inaka/erlang-katana/tree/0.2.17) (2015-12-31)
+[Full Changelog](https://github.com/inaka/erlang-katana/compare/0.2.15...0.2.17)
+
+**Closed issues:**
+
+- Version Bump to 0.2.17 [\#106](https://github.com/inaka/erlang-katana/issues/106)
+- Hex Packages [\#97](https://github.com/inaka/erlang-katana/issues/97)
 
 **Merged pull requests:**
 
+- \[\#109\] Version bump to 0.2.18 [\#110](https://github.com/inaka/erlang-katana/pull/110) ([davecaos](https://github.com/davecaos))
+- \[\#106\] Update Contributors [\#108](https://github.com/inaka/erlang-katana/pull/108) ([davecaos](https://github.com/davecaos))
+- \[\#106.version.bump.0.2.16 [\#107](https://github.com/inaka/erlang-katana/pull/107) ([davecaos](https://github.com/davecaos))
 - \[\#97\] Updated for hexer hex package tool [\#105](https://github.com/inaka/erlang-katana/pull/105) ([davecaos](https://github.com/davecaos))
 
 ## [0.2.15](https://github.com/inaka/erlang-katana/tree/0.2.15) (2015-12-23)

Makefile

@@ -1,16 +1,23 @@
 PROJECT = katana
 
-DEPS = eper inaka_aleppo xref_runner elvis_core
-SHELL_DEPS := sync
+DEPS = inaka_aleppo xref_runner elvis_core
 TEST_DEPS = mixer
-LOCAL_DEPS := xmerl tools compiler syntax_tools common_test inets ssl test_server hipe public_key dialyzer wx
+SHELL_DEPS = sync
+BUILD_DEPS = inaka_mk hexer_mk
+LOCAL_DEPS = xmerl tools compiler syntax_tools common_test inets ssl test_server hipe public_key dialyzer wx
+
+# Prevents erlang.mk from downloading elvis_core's katana dependency
+IGNORE_DEPS = katana
 
-dep_eper         = hex 0.94.0
 dep_inaka_aleppo = hex 0.9.5
 dep_xref_runner  = hex 0.2.4
-dep_inaka_mixer  = hex 0.1.4
+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_sync         = git https://github.com/inaka/sync.git        0.1.3
+dep_sync         = git https://github.com/rustyio/sync.git 9c78e7b
+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.1
+
+DEP_PLUGINS = inaka_mk hexer_mk
 
 include erlang.mk
 
@@ -20,28 +27,10 @@ ERLC_OPTS := +warn_unused_vars +warn_export_all +warn_shadow_vars +warn_unused_i
 ERLC_OPTS += +warn_bif_clash +warn_unused_record +warn_deprecated_function +warn_obsolete_guard +strict_validation
 ERLC_OPTS += +warn_export_vars +warn_exported_vars +warn_missing_spec +warn_untyped_record +debug_info
 
-DIALYZER_DIRS := ebin/ test/
-DIALYZER_OPTS := --verbose --statistics -Wunmatched_returns
-
 TEST_ERLC_OPTS += +debug_info
-CT_OPTS = -cover test/katana.coverspec
-
-SHELL_OPTS += -name ${PROJECT}@`hostname` -pa ebin -pa deps/*/ebin -s sync
-
-quicktests: app
-	@$(MAKE) --no-print-directory app-build test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)"
-	$(verbose) mkdir -p $(CURDIR)/logs/
-	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)
-
-test-build-plt: ERLC_OPTS=$(TEST_ERLC_OPTS)
-test-build-plt:
-	@$(MAKE) --no-print-directory test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)"
-	$(gen_verbose) touch ebin/test
-
-plt-all: PLT_APPS := $(ALL_TEST_DEPS_DIRS)
-plt-all: test-deps test-build-plt plt
+CT_OPTS = -cover test/cover.spec
 
-dialyze-all: app test-build-plt dialyze
+SHELL_OPTS = -s sync
 
 erldocs:
 	erldocs . -o docs

elvis.config

@@ -39,8 +39,8 @@
        },
       #{dirs => ["."],
         filter => "Makefile",
-        rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}},
-                  {elvis_project, protocol_for_deps_erlang_mk, #{ regex => "(https://.*|[0-9]+([.][0-9]+)*)"}}]
+        rules => [{elvis_project, no_deps_master_erlang_mk},
+                  {elvis_project, protocol_for_deps_erlang_mk, #{regex => "(https://.*|[0-9]+([.][0-9]+)*)"}}]
        },
       #{dirs => ["."],
         filter => "elvis.config",