diff --git a/.travis.yml b/.travis.yml index e0e7b1a..1ba0ff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ notifications: - eduardo@gurgel.me otp_release: - 17.0 -script: mix test --no-start install: mix deps.get before_install: - mkdir -p vendor/elixir - wget -q https://github.com/elixir-lang/elixir/releases/download/v0.13.1/Precompiled.zip && unzip -qq Precompiled.zip -d vendor/elixir - export PATH="$PATH:$PWD/vendor/elixir/bin" - export MIX_ENV=test + - mix local.hex --force +script: mix test --no-start diff --git a/mix.exs b/mix.exs index 0731cab..64110ee 100644 --- a/mix.exs +++ b/mix.exs @@ -6,7 +6,7 @@ defmodule Httparrot.Mixfile do version: "0.1.0", name: "HTTParrot", elixir: "~> 0.13.1", - deps: deps(Mix.env) ] + deps: deps ] end def application do @@ -18,15 +18,9 @@ defmodule Httparrot.Mixfile do env: [ http_port: 8080, ssl: true, https_port: 8433 ] ] end - defp deps(:dev) do - [ {:cowboy, github: "extend/cowboy", tag: "0.9.0" }, - {:jsex, github: "talentdeficit/jsex", tag: "v1.0.2" } ] + defp deps do + [ {:cowboy, github: "extend/cowboy", tag: "0.9.0"}, + {:jsex, '~> 2.0'}, + {:meck, github: "eproxus/meck", tag: "0.8.2", only: :test } ] end - - defp deps(:test) do - deps(:dev) ++ - [ {:meck, github: "eproxus/meck", ref: "69f02255a8219185bf55da303981d86886b3c24b" } ] - end - - defp deps(_), do: deps(:dev) end diff --git a/mix.lock b/mix.lock index e47c6c9..984cac4 100644 --- a/mix.lock +++ b/mix.lock @@ -1,6 +1,6 @@ %{"cowboy": {:git, "git://github.com/extend/cowboy.git", "db52494371ea249f38d51108c7d79cf487ff6374", [tag: "0.9.0"]}, "cowlib": {:git, "git://github.com/extend/cowlib.git", "63298e8e160031a70efff86a1acde7e7db1fcda6", [ref: "0.4.0"]}, - "jsex": {:git, "git://github.com/talentdeficit/jsex.git", "8a92e26180cb11c858130f9693a195a0fad1ecf9", [tag: "v1.0.2"]}, - "jsx": {:git, "git://github.com/talentdeficit/jsx.git", "507fa4c41db33c81e925ab53f4d789d234aaff2f", [tag: "v2.0.1"]}, - "meck": {:git, "git://github.com/eproxus/meck.git", "69f02255a8219185bf55da303981d86886b3c24b", [ref: "69f02255a8219185bf55da303981d86886b3c24b"]}, + "jsex": {:package, "2.0.0"}, + "jsx": {:package, "2.0.2"}, + "meck": {:git, "git://github.com/eproxus/meck.git", "dde759050eff19a1a80fd854d7375174b191665d", [tag: "0.8.2"]}, "ranch": {:git, "git://github.com/extend/ranch.git", "5df1f222f94e08abdcab7084f5e13027143cc222", [ref: "0.9.0"]}}