Merge pull request #24 from getong/update_deps

update deps

.gitignore

@@ -8,7 +8,6 @@ ebin
 rel/example_project
 .concrete/DEV_MODE
 .rebar
-rebar.lock
 _build/
 priv/
 doc/

.travis.yml

@@ -1,9 +1,12 @@
 language: erlang
 otp_release:
-   - 17.5
-   - 18.2
-   - 19.3
-   - 20.0
    - 21.0
-install: make travis-install
-script: make travis-run
+   - 20.3
+   - 19.3
+   - 18.3
+   - 17.5
+
+install: 
+   - make travis-install
+   - wget -c https://github.com/erlang/rebar3/releases/download/3.6.2/rebar3 && chmod +x rebar3
+script: REBAR=./rebar3 make travis-run

Makefile

@@ -1,6 +1,6 @@
 ERL=erl
 BEAMDIR=./deps/*/ebin ./ebin
-REBAR=./rebar3
+REBAR ?= rebar3
 PATH := ./redis-git/src:${PATH}
 
 # CLUSTER REDIS NODES

mix.exs

@@ -1,7 +1,7 @@
 defmodule EredisCluster.Mixfile do
   use Mix.Project
 
-  @version File.read!("VERSION") |> String.trim
+  @version String.trim(File.read!("VERSION"))
 
   def project do
     [app: :eredis_cluster,
@@ -18,9 +18,9 @@ defmodule EredisCluster.Mixfile do
   end
 
   defp deps do
-    [{:poolboy, "~> 1.5.1"},
-      {:eredis, "~> 1.1.0"},
-      {:ex_doc, ">= 0.0.0", only: :dev}]
+    [{:poolboy, "1.5.2"},
+      {:eredis, "~> 1.2.0"},
+      {:ex_doc, "~> 0.19.1"}]
   end
 
   defp package do

mix.lock

@@ -1,4 +1,9 @@
-%{"earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], [], "hexpm"},
-  "eredis": {:hex, :eredis, "1.1.0", "8d8d74496f35216679b97726b75fb1c8715e99dd7f3ef9f9824a2264c3e0aac0", [:rebar3], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.16.2", "3b3e210ebcd85a7c76b4e73f85c5640c011d2a0b2f06dcdf5acdb2ae904e5084", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
-  "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"}}
+%{
+  "earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm"},
+  "eredis": {:hex, :eredis, "1.2.0", "0b8e9cfc2c00fa1374cd107ea63b49be08d933df2cf175e6a89b73dd9c380de4", [:rebar3], [], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
+  "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"},
+  "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},
+}

rebar.config

@@ -11,4 +11,6 @@
              {pretty_print, erl_pp},
              {preprocess, true}]}.
 
-{deps, [{eredis, "1.1.0"}, {poolboy, "1.5.1"}]}.
+{deps, [{eredis, "1.2.0"},
+       {poolboy, "1.5.2"}
+       ]}.

rebar.lock

@@ -0,0 +1,8 @@
+{"1.1.0",
+[{<<"eredis">>,{pkg,<<"eredis">>,<<"1.2.0">>},0},
+ {<<"poolboy">>,{pkg,<<"poolboy">>,<<"1.5.2">>},0}]}.
+[
+{pkg_hash,[
+ {<<"eredis">>, <<"0B8E9CFC2C00FA1374CD107EA63B49BE08D933DF2CF175E6A89B73DD9C380DE4">>},
+ {<<"poolboy">>, <<"392B007A1693A64540CEAD79830443ABF5762F5D30CF50BC95CB2C1AAAFA006B">>}]}
+].