Skip to content

Commit

Permalink
Switch to package usage
Browse files Browse the repository at this point in the history
  • Loading branch information
ferd committed Jul 6, 2017
1 parent 1a39e41 commit 95913ec
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ language: erlang
install: 'true'
script: ./rebar3 do update, eunit
otp_release:
- 20.0
- 19.3
- 18.1
- 17.5
- 17.1
- 17.0
- R16B03-1
- R16B03
- R16B02
- R16B01
- R15B03
- R15B02
3 changes: 1 addition & 2 deletions rebar.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{deps, [{bcrypt, ".*",
{git, "https://github.com/smarkets/erlang-bcrypt.git", {branch, "master"}}}]}.
{deps, [{bcrypt, "1.0.0"}]}.

{eunit_opts, [{dir, "test"}]}.

Expand Down
9 changes: 9 additions & 0 deletions rebar.config.script
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
case erlang:function_exported(rebar3, main, 1) of
true -> % rebar3
CONFIG;
false -> % rebar 2.x or older
%% Rebuild deps
[{deps, [{bcrypt, ".*",
{git, "https://github.com/smarkets/erlang-bcrypt.git", {branch, "master"}}}]}
| lists:keydelete(deps, 1, CONFIG)]
end.
10 changes: 6 additions & 4 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[{<<"bcrypt">>,
{git,"https://github.com/smarkets/erlang-bcrypt.git",
{ref,"a63df34d4957dbb70a703c67c75ed9fee2c78971"}},
0}].
{"1.1.0",
[{<<"bcrypt">>,{pkg,<<"bcrypt">>,<<"1.0.0">>},0}]}.
[
{pkg_hash,[
{<<"bcrypt">>, <<"1C0F76981D8A7B32E4DAA813408BFCA5BA8B1286196EB771F026D02C710F71C5">>}]}
].
2 changes: 1 addition & 1 deletion src/erlpass.app.src
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{application, erlpass,
[{description, "Safely handle passwords with bcrypt and Erlang"},
{vsn, "1.0.3"},
{vsn, "1.0.4"},
{modules, [erlpass]},
{applications, [stdlib, kernel, bcrypt]},
{registered, []}
Expand Down

0 comments on commit 95913ec

Please sign in to comment.