From 53c4e6ec1182c409c9869b42623d4be0d59b08ae Mon Sep 17 00:00:00 2001
From: jiahuili <Jiahui.Li@ibm.com>
Date: Wed, 20 Jul 2022 12:05:12 -0500
Subject: [PATCH] rebar3: Makefile `make dialyze` and `make introspect`

---
 Makefile            | 22 +++-------------------
 rebar.config.script |  1 +
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 28b263c8248..1c7923e1338 100644
--- a/Makefile
+++ b/Makefile
@@ -77,10 +77,6 @@ skip_deps=folsom,meck,mochiweb,triq,proper,snappy,bcrypt,hyper,ibrowse
 suites=
 tests=
 
-DIALYZE_OPTS=$(shell echo "\
-	apps=$(apps) \
-	skip_deps=$(skip_deps) \
-	" | sed -e 's/[a-z]\{1,\}= / /g')
 EXUNIT_OPTS=$(subst $(comma),$(space),$(tests))
 
 TEST_OPTS="-c 'startup_jitter=0' -c 'default_security=admin_local'"
@@ -330,28 +326,16 @@ weatherreport-test: devclean escriptize
 ################################################################################
 
 
-.PHONY: build-plt
-# target: build-plt - Build project-specific PLT
-build-plt:
-	@$(REBAR) -r build-plt $(DIALYZE_OPTS)
-
-
-.PHONY: check-plt
-# target: check-plt - Check the PLT for consistency and rebuild it if it is not up-to-date
-check-plt:
-	@$(REBAR) -r check-plt $(DIALYZE_OPTS)
-
-
 .PHONY: dialyze
 # target: dialyze - Analyze the code for discrepancies
-dialyze: .rebar
-	@$(REBAR) -r dialyze $(DIALYZE_OPTS)
+dialyze:
+	@$(REBAR3) dialyzer
 
 
 .PHONY: introspect
 # target: introspect - Check for commits difference between rebar.config and repository
 introspect:
-	@$(REBAR) -r update-deps
+	@$(REBAR3) upgrade --all
 	@build-aux/introspect
 
 ################################################################################
diff --git a/rebar.config.script b/rebar.config.script
index 49f1eabe3bc..5abcd3a2c9d 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -107,6 +107,7 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
 AddConfig = [
     {require_otp_vsn, "23|24|25"},
     {erl_opts, [{i, "../"}, {d, 'COUCHDB_ERLANG_VERSION', VerString}]},
+    {deps, []},
     {plugins, [ic, erlfmt]},
 	{erlfmt, [write]},
     {eunit_opts, [