Merge pull request dnsimple#21 from tsloughter/hex-deps

use hex package for base32 dep
circls · Sep 15, 2019 · cd19235 · cd19235
2 parents f637bf9 + 86d8d1b
commit cd19235
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+rebar3
+.rebar3
 .eunit
 doc
 ebin

diff --git a/Makefile b/Makefile
@@ -8,19 +8,16 @@ gh-pages : VERSION := $(shell sed -n 's/.*{vsn,.*"\(.*\)"}.*/\1/p' src/dns.app.s
 
 .PHONY: all doc clean test
 
-all: deps compile
+all: compile
 
 $(REBAR):
 	wget $(REBAR_URL) && chmod +x rebar3	
 
 compile: $(REBAR)
 	@$(REBAR) compile
 
-deps: $(REBAR)
-	@$(REBAR) get-deps
-
 doc: $(REBAR)
-	@$(REBAR) doc skip_deps=true
+	@$(REBAR) edoc
 
 clean: $(REBAR)
 	@$(REBAR) clean
@@ -45,5 +42,5 @@ gh-pages: $(REBAR) test doc
 	rm -fr ${TMPDIR}
 
 test: $(REBAR) all
-	@$(REBAR) eunit skip_deps=true
+	@$(REBAR) eunit
 	@$(REBAR) dialyzer
diff --git a/mix.exs b/mix.exs
diff --git a/rebar.config b/rebar.config
@@ -6,13 +6,12 @@
             inline, inline_list_funcs,
             {platform_define, "^[0-9]+", namespaced_types}
 ]}.
-{deps, [{base32, ".*",
-         {git, "https://github.com/dnsimple/base32_erlang.git", {branch, "master"}}}
-       ]}.
-{eunit_opts, [verbose]}.
 
+{deps, [base32]}.
 
+{eunit_opts, [verbose]}.
 
+{plugins, [{provider_asn1, "0.2.3"}]}.
 {provider_hooks, [
     {pre, [
         {compile, {asn, compile}}

diff --git a/rebar.config.script b/rebar.config.script
diff --git a/rebar.lock b/rebar.lock
@@ -1,4 +1,6 @@
-[{<<"base32">>,
-  {git,"https://github.com/dnsimple/base32_erlang.git",
-       {ref,"8b1ebce8895662b05970f481c9ce1a9f44add50b"}},
-  0}].
+{"1.1.0",
+[{<<"base32">>,{pkg,<<"base32">>,<<"0.1.0">>},0}]}.
+[
+{pkg_hash,[
+ {<<"base32">>, <<"044F6DC95709727CA2176F3E97A41DDAA76B5BC690D3536908618C0CB32616A2">>}]}
+].
diff --git a/rebar3 b/rebar3
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    rebar3
+    .rebar3
     .eunit
     doc
     ebin
@@ Expand Down @@