From 67d7ade1f58df483bddd076acf2c349c1d538046 Mon Sep 17 00:00:00 2001
From: Gilbert Wong <gilbertwong96@icloud.com>
Date: Sat, 30 Mar 2019 10:45:18 +0800
Subject: [PATCH] Update cuttlefish version

---
 Makefile     | 6 +++---
 rebar.config | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 393503fc3..6ccb9316e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 PROJECT = emqx
 PROJECT_DESCRIPTION = EMQ X Broker
 
-DEPS = jsx gproc gen_rpc ekka esockd cowboy emqx_passwd replayq
+DEPS = jsx gproc gen_rpc ekka esockd cowboy replayq
 
 dep_jsx     = git-emqx https://github.com/talentdeficit/jsx 2.9.0
 dep_gproc   = git-emqx https://github.com/uwiger/gproc 0.8.0
@@ -18,7 +18,7 @@ NO_AUTOPATCH = cuttlefish
 ERLC_OPTS += +debug_info -DAPPLICATION=emqx
 
 BUILD_DEPS = cuttlefish
-dep_cuttlefish = git-emqx https://github.com/emqx/cuttlefish v2.2.0
+dep_cuttlefish = git-emqx https://github.com/emqx/cuttlefish v2.2.1
 
 TEST_DEPS = meck
 dep_meck = hex-emqx 0.8.13
@@ -49,7 +49,7 @@ PLT_APPS = sasl asn1 ssl syntax_tools runtime_tools crypto xmerl os_mon inets pu
 DIALYZER_DIRS := ebin/
 DIALYZER_OPTS := --verbose --statistics -Werror_handling -Wrace_conditions #-Wunmatched_returns
 
-$(shell [ -f erlang.mk ] || curl -s -o erlang.mk https://raw.githubusercontent.com/emqx/erlmk/master/erlang.mk)
+$(shell [ -f erlang.mk ] || curl -s -o erlang.mk https://raw.githubusercontent.com/emqx/erlmk/win30/erlang.mk)
 include erlang.mk
 
 clean:: gen-clean
diff --git a/rebar.config b/rebar.config
index d45ef21b8..b73d8b0f9 100644
--- a/rebar.config
+++ b/rebar.config
@@ -7,7 +7,7 @@
 %% appended to deps in rebar.config.script
 {github_emqx_deps,
     [{gen_rpc, "2.3.1"},
-     {cuttlefish, "win30"},
+     {cuttlefish, "v2.2.1"},
      {ekka, "v0.5.3"},
      {replayq, "v0.1.1"},
      {esockd, "v5.4.4"}