Skip to content

Commit 9167ad6

Browse files
author
Luke Bakken
committed
Merge branch 'master' into develop
2 parents fb96f88 + f3a0592 commit 9167ad6

File tree

13 files changed

+129
-41
lines changed

13 files changed

+129
-41
lines changed

‎.gitignore‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
_build/
12
.rebar/
2-
.eunit/*
3-
deps/*
4-
priv/*
3+
.eunit/
4+
deps/
5+
priv/
56
*.o
67
*.beam
78
include/riakclient_pb.hrl
8-
doc/*
9-
ebin/*
9+
doc/
10+
ebin/
1011
/.eqc-info
1112
/current_counterexample.eqc
1213
.local_dialyzer_plt

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[submodule "doc"]
2-
path = doc
2+
path = edoc
33
url = https://github.com/basho/riak-erlang-client.git
44
branch = gh-pages
55
[submodule "tools"]

‎Makefile‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
.PHONY: all lint clean compile deps distclean release docs
22

3+
PROJDIR := $(realpath $(CURDIR))
4+
REBAR ?= $(PROJDIR)/rebar
5+
36
all: deps compile
47

58
lint: xref dialyzer
69

710
compile: deps
8-
./rebar compile
11+
$(REBAR) compile
912

1013
deps:
11-
./rebar get-deps
14+
$(REBAR) get-deps
1215

1316
clean:
14-
./rebar clean
17+
$(REBAR) clean
1518

1619
distclean: clean
17-
./rebar delete-deps
20+
$(REBAR) delete-deps
1821

1922
release: compile
2023
ifeq ($(VERSION),)
@@ -23,13 +26,17 @@ endif
2326
ifeq ($(RELEASE_GPG_KEYNAME),)
2427
$(error RELEASE_GPG_KEYNAME must be set to build a release and deploy this package)
2528
endif
26-
@echo "==> Tagging version $(VERSION)"
27-
# NB: Erlang client version strings do NOT start with 'v'. Le Sigh.
28-
# validate VERSION and allow pre-releases
29-
@./tools/build/publish $(VERSION) master validate
30-
@git tag --sign -a "$(VERSION)" -m "riak-erlang-client $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
31-
@git push --tags
32-
@./tools/build/publish $(VERSION) master 'Riak Erlang Client' 'riak-erlang-client'
29+
echo "==> Tagging version $(VERSION)"
30+
$(PROJDIR)/tools/build/publish $(VERSION) master validate
31+
echo "$(VERSION)" > $(PROJDIR)/VERSION
32+
git add --force $(PROJDIR)/VERSION
33+
git commit --message="riak-erlang-client $(VERSION)"
34+
git push
35+
git tag --sign -a "$(VERSION)" -m "riak-erlang-client $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
36+
git push --tags
37+
$(PROJDIR)/tools/build/publish $(VERSION) master 'Riak Erlang Client' 'riak-erlang-client'
38+
mix deps.get
39+
mix hex.publish
3340

3441

3542
DIALYZER_APPS = kernel stdlib sasl erts eunit ssl tools crypto \

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ This is not a comprehensive list, please see the commit history.
713713
* [Andrzej Kajetanowicz](https://github.com/kajetanowicz)
714714
* [Andy Gross](https://github.com/argv0)
715715
* [Anthony Molinaro](https://github.com/djnym)
716+
* [Bernard Duggan](https://github.com/bernardd)
716717
* [Brett Hazen](https://github.com/javajolt)
717718
* [Brian McClain](https://github.com/BrianMMcClain)
718719
* [Brian Roach](https://github.com/broach)
@@ -728,6 +729,7 @@ This is not a comprehensive list, please see the commit history.
728729
* [Dave Smith](https://github.com/djsmith42)
729730
* [Dmitry Demeshchuk](https://github.com/doubleyou)
730731
* [Drew](https://github.com/drew)
732+
* [Drew Kerrigan](https://github.com/drewkerrigan)
731733
* [Eduardo Gurgel](https://github.com/edgurgel)
732734
* Engel A. Sanchez
733735
* [Eric Redmond](https://github.com/coderoshi)

‎RELNOTES.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Release Notes
22
=============
33

4+
* [`2.5.3`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.5.3)
5+
* Use `riak_pb` version `2.3.2`
6+
* Publish to `hex.pm`
47
* `2.5.2`
58
* Use `riak_pb` version `2.3.0.0`
69
* [`2.5.1`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.5.1)

‎VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.5.3

‎doc‎ renamed to ‎edoc‎

Submodule edoc updated from 0000000 to 54d8d5a

‎mix.exs‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
defmodule Riakc.Mixfile do
2+
use Mix.Project
3+
4+
@version File.read!("VERSION") |> String.strip
5+
6+
def project do
7+
[app: :riakc,
8+
version: @version,
9+
description: "The Riak client for Erlang",
10+
package: package(),
11+
deps: deps(),
12+
erlc_options: erlc_options()]
13+
end
14+
15+
defp erlc_options do
16+
otp_rel = :erlang.list_to_integer(:erlang.system_info(:otp_release))
17+
18+
o1 = try do
19+
case otp_rel do
20+
v when v >= 17 -> [{:d, :namespaced_types}]
21+
_ -> []
22+
end
23+
catch
24+
_ -> []
25+
end
26+
27+
o2 = try do
28+
case otp_rel do
29+
v when v >= 18 -> [{:d, :deprecated_now}]
30+
_ -> []
31+
end
32+
catch
33+
_ -> []
34+
end
35+
36+
o3 = try do
37+
case otp_rel do
38+
v when v >= 19 -> [{:d, :deprecated_19}]
39+
_ -> []
40+
end
41+
catch
42+
_ -> []
43+
end
44+
45+
extra_options = o1 ++ o2 ++ o3
46+
47+
[:debug_info, :warnings_as_errors | extra_options]
48+
end
49+
50+
defp deps do
51+
[
52+
{:riak_pb, "~> 2.3"},
53+
{:ex_doc, ">= 0.0.0", only: :dev}
54+
]
55+
end
56+
57+
defp package do
58+
[files: ~w(include src mix.exs LICENSE Makefile README.md RELNOTES.md rebar.config rebar.config.script tools.mk tools test priv VERSION),
59+
maintainers: ["Drew Kerrigan", "Luke Bakken", "Alex Moore"],
60+
licenses: ["Apache 2.0"],
61+
links: %{"GitHub" => "https://github.com/basho/riak-erlang-client"}]
62+
end
63+
end

‎rebar.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
]}.
1414

1515
{deps, [
16-
{riak_pb, ".*", {git, "https://github.com/basho/riak_pb", {tag, "2.3.0.0"}}}
16+
{riak_pb, "2\.3\.[0-9]+", {git, "https://github.com/basho/riak_pb", {tag, "2.3.2"}}}
1717
]}.
1818

1919
{edoc_opts, [
20+
{dir, "edoc"},
2021
{stylesheet_file, "priv/edoc.css"},
2122
{preprocess, true}
2223
]}.

‎src/riakc.app.src‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
{env, [
1212
%% Set default timeout for operations.
1313
%% Individual operation timeouts can be supplied,
14-
%% e.g. get_timeout, put_timeout that will
14+
%% e.g. get_timeout, put_timeout that will
1515
%% override the default.
1616
{timeout, 60000}
1717
]}
1818
]}.
19-

0 commit comments

Comments
 (0)