Skip to content

Commit 956bd7b

Browse files
committed
bump to 1.4.1
fix #255
1 parent dca9b0a commit 956bd7b

File tree

7 files changed

+23
-28
lines changed

7 files changed

+23
-28
lines changed

Makefile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ PLT=.hackney.plt
44

55
all: build
66

7-
dev: devbuild
8-
9-
doc: dev
10-
$(REBAR) as dev edoc
7+
doc:
8+
$(REBAR) edoc
119

1210
clean:
1311
$(REBAR) clean
@@ -18,15 +16,7 @@ build:
1816
test:
1917
$(REBAR) eunit
2018

21-
# development
22-
#
23-
devclean:
24-
$(REBAR) as dev clean
25-
26-
devbuild:
27-
$(REBAR) as dev compile
28-
2919
dialyzer:
3020
$(REBAR) dialyzer
3121

32-
.PHONY: test
22+
.PHONY: doc test

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Copyright (c) 2012-2015 Benoît Chesneau.
66

7-
__Version:__ 1.4.0
7+
__Version:__ 1.4.1
88

99
# hackney
1010

@@ -485,8 +485,8 @@ using the **Makefile**:
485485

486486
```sh
487487

488-
$ make dev ; # compile & get deps
489-
$ make devclean ; # clean all files
488+
$ make ; # compile and get deps
489+
$ make clean ; # clean all files
490490
```
491491

492492
For successfully running the hackney test suite locally it is necessary to

doc/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Copyright (c) 2012-2015 Benoît Chesneau.
66

7-
__Version:__ 1.4.0
7+
__Version:__ 1.4.1
88

99
# hackney
1010

@@ -485,8 +485,8 @@ using the **Makefile**:
485485

486486
```sh
487487

488-
$ make dev ; # compile & get deps
489-
$ make devclean ; # clean all files
488+
$ make ; # compile and get deps
489+
$ make clean ; # clean all files
490490
```
491491

492492
For successfully running the hackney test suite locally it is necessary to

doc/overview.edoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
@copyright 2012-2015 Benoît Chesneau.
20-
@version 1.4.0
20+
@version 1.4.1
2121
@title hackney - HTTP client library in Erlang
2222

2323
@doc
@@ -484,8 +484,8 @@ build hackney using the `rebar_dev.config' file. It can also be built
484484
using the **Makefile**:
485485

486486
<pre lang="sh">
487-
$ make dev ; # compile &amp; get deps
488-
$ make devclean ; # clean all files</pre>
487+
$ make ; # compile and get deps
488+
$ make clean ; # clean all files</pre>
489489

490490

491491
For successfully running the hackney test suite locally it is necessary to

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
%% Not yet supported in rebar3
2727
%% {require_otp_vsn, "R14|R15|R16|17|18"}.
2828

29-
{profiles, [{dev,
29+
{profiles, [{docs,
3030
[{deps, [
3131
{edown,
3232
{git, "https://github.com/uwiger/edown.git",

rebar.config.script

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
{ok, VSN} = application:get_key(rebar, vsn),
2-
[VSN1 | _] = string:tokens(VSN, "-"),
3-
[Maj, Min, Patch] = string:tokens(VSN1, "."),
4-
IsRebar3 = (list_to_integer(Maj) >= 3),
1+
IsRebar3 = case application:get_env(rebar, vsn) of
2+
{ok, VSN} ->
3+
[VSN1 | _] = string:tokens(VSN, "-"),
4+
[Maj, Min, Patch] = string:tokens(VSN1, "."),
5+
(list_to_integer(Maj) >= 3);
6+
undefined ->
7+
%% is mix is used
8+
lists:keymember(mix, 1, application:loaded_applications())
9+
end,
510

611

712
Rebar2Deps = [

src/hackney.app.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{application, hackney,
55
[
66
{description, "simple HTTP client"},
7-
{vsn, "1.4.0"},
7+
{vsn, "1.4.1"},
88
{registered, [hackney_pool]},
99
{applications, [kernel,
1010
stdlib,

0 commit comments

Comments
 (0)