Merge pull request #4 from ErlyORM/otp_21

Otp 21

.gitignore

@@ -1,10 +1,13 @@
-ebin/
-deps/
-*.plt
-*.beam
-app.config
+erl_crash.dump
+/.settings
+/.rebar/
+.settings
+rebar3.crashdump
+/_build
+/deps
 .eunit
-log*
-/.project
-/.settings/
+/ebin
+/doc
+rebar.lock
+.project
 .idea

.travis.yml

@@ -1,28 +1,18 @@
 language: erlang
 sudo: false
 otp_release:
-# Test on all supported releases
+# Test on all supported releases & some more
+   - 21.1
+   - 21.0
+   - 20.3
    - 19.3
-   - 19.2
-   - 19.0
    - 18.3
-   - 18.2.1
-   - 18.1
-   - 18.0
    - 17.5
-   - 17.4
-   - 17.3
-   - 17.1
-   - 17.0
-   - R16B03-1
-   - R16B03
-   - R16B02
-   - R16B01
-   - R16B
 
 script:
   - make
-  - make plt
+#  - make test
   - make dialyze
+
 notifications:
   email: false

Makefile

@@ -1,57 +1,35 @@
-REBAR = ./rebar
-DIALYZER = dialyzer
-TOUCH = touch
+ERL = erl
+GIT = git
+REBAR = rebar3
+REBAR_VER = 3.6.2
 
-.PHONY: all deps compile escripize clean doc eunit ct test \
-	run plt analyze get-deps compile-deps
+all: compile
 
-all: deps compile
-
-deps: get-deps compile-deps
-
-compile: 
-	@$(REBAR) compile skip_deps=true
-
-escriptize: 
-	@$(REBAR) escriptize
-
-clean: 
-	@$(REBAR) clean
-	@rm -f test/*.beam erl_crash.dump ./deps/.compile-deps 
-
-eunit: deps compile 
-	@$(REBAR) skip_deps=true eunit
+compile:
+	@$(REBAR) compile
 
-ct: deps compile 
-	@$(REBAR) skip_deps=true ct 
+rebar_src:
+	@rm -rf $(PWD)/rebar_src
+	@$(GIT) clone https://github.com/erlang/rebar3.git rebar_src
+	@$(GIT) -C rebar_src checkout tags/$(REBAR_VER)
+	@cd $(PWD)/rebar_src/; ./bootstrap
+	@cp $(PWD)/rebar_src/rebar3 $(PWD)
+	@rm -rf $(PWD)/rebar_src
 
-test: eunit ct
+get-deps:
+	@$(REBAR) upgrade
 
-## dialyzer
-PLT_FILE = ~/ddb.plt
-PLT_APPS ?= kernel stdlib erts compiler crypto inets ssl public_key \
-		xmerl deps/*
-DIALYZER_OPTS ?= -Werror_handling -Wrace_conditions -Wunmatched_returns \
-		-Wunderspecs --verbose --fullpath -n
+deps:
+	@$(REBAR) compile
 
 .PHONY: dialyze
-dialyze: all
-	@[ -f $(PLT_FILE) ] || $(MAKE) plt
-	@dialyzer --plt $(PLT_FILE) $(DIALYZER_OPTS) ebin || [ $$? -eq 2 ];
-
-## In case you are missing a plt file for dialyzer,
-## you can run/adapt this command
-.PHONY: plt
-plt:
-	@echo "Building PLT, may take a few minutes"
-	@dialyzer --build_plt --output_plt $(PLT_FILE) --apps \
-		$(PLT_APPS) || [ $$? -eq 2 ];
-
-docs:
-	@$(REBAR) doc skip_deps=true
+dialyze:
+	@$(REBAR) dialyzer || [ $$? -eq 1 ];
 
-get-deps:
-	@$(REBAR) get-deps
+clean:
+	@$(REBAR) clean
+	rm -fv erl_crash.dump
 
-compile-deps:
-	@$(REBAR) compile
+.PHONY: test
+test:
+	@$(REBAR) eunit

rebar.config

@@ -1,22 +1,42 @@
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 ft=erlang et
 
+{erl_opts, [
+    debug_info,
+    warn_unused_vars,
+    warn_unused_import,
+    warn_exported_vars
+]}.
+
 {deps, [
-        {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "v2.8.2"}}},
-        {ibrowse, {git, "https://github.com/cmullaparthi/ibrowse.git", {ref, "v4.4.0"}}}
-       ]}.
+    {jsx, ".*", {git, "https://github.com/talentdeficit/jsx.git", {tag, "v2.9.0"}}},
+    {ibrowse, ".*", {git, "https://github.com/cmullaparthi/ibrowse.git", {tag, "v4.4.1"}}}
+]}.
 
-{require_otp_vsn, "R16|17|18|19|20"}.
+{require_otp_vsn, "17|18|19|20|21|22"}.
 
-{erl_opts, [
-            fail_on_warning,
-            debug_info
-           ]}.
+%% == Dialyzer ==
+{dialyzer, [
+    {warnings, [error_handling, race_conditions, unmatched_returns, underspecs]},
+    {get_warnings, false},
+    {plt_apps, top_level_deps}, % top_level_deps | all_deps
+    {plt_extra_apps, []},
+    {plt_location, local}, % local | "/my/file/name"
+    {plt_prefix, "ddb"},
+    {base_plt_apps, [stdlib, kernel, erts]},
+    {base_plt_location, global}, % global | "/my/file/name"
+    {base_plt_prefix, "rebar3"}
+]}.
 
 {cover_enabled, true}.
 
+{plugins, []}.
+
 {clean_files, ["*.eunit", "ebin/*.beam"]}.
 
-{eunit_opts, [verbose, {report, {eunit_surefire, [{dir, "."}]}}]}.
+{eunit_opts, [
+    verbose,
+    {report, {eunit_surefire, [{dir, "."}]}}
+]}.
 
 {validate_app_modules, false}.

src/ddb.app.src

@@ -1,18 +1,21 @@
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 ft=erlang et
 
-{application, ddb,
- [
-  {description, "AWS DynamoDB client"},
-  {vsn, "0.1.3"},
-  {registered, [ddb_sup]},
-  {applications, [
-                  kernel,
-                  stdlib,
-                  crypto,
-                  ssl,
-                  jsx,
-                  ibrowse
-                 ]},
-  {env, []}
- ]}.
+{application, ddb, [
+    {description, "AWS DynamoDB client"},
+    {vsn, "0.1.4"},
+    {registered, [ddb_sup]},
+    {applications, [
+        kernel,
+        stdlib,
+        crypto,
+        ssl,
+        jsx,
+        ibrowse
+    ]},
+    {env, []},
+    {maintainers, ["ChicagoBoss Team"]},
+    {links, [
+        {"Github", "https://github.com/ErlyORM/ddb"}
+    ]}
+]}.