Skip to content

Commit

Permalink
Merge pull request #5 from marcelog/updating_elixir_and_deps
Browse files Browse the repository at this point in the history
updating deps, preparing for otp-19 and elixir 1.3.0
  • Loading branch information
marcelog committed Jun 25, 2016
2 parents 21d2b3a + 22b5cc8 commit 83a2dc1
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 23 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ elixir:
- 1.1.0
- 1.1.1
- 1.2.0
- 1.3.0
otp_release:
- 18.0
12 changes: 6 additions & 6 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ Find the user guide in the github repo at: https://github.com/marcelog/elixir_au

defp deps do
[
{:ibrowse, github: "cmullaparthi/ibrowse", tag: "v4.2"},
{:earmark, "~> 0.1", only: :dev},
{:ex_doc, "~> 0.7", only: :dev},
{:coverex, "~> 1.4.1", only: :test},
{:ibrowse, github: "cmullaparthi/ibrowse", tag: "v4.3"},
{:earmark, "~> 0.2.1", only: :dev},
{:ex_doc, "~> 0.12.0", only: :dev},
{:coverex, "~> 1.4.9", only: :test},
{:exmerl, "~> 0.1.1"},
{:xml_builder, "~> 0.0.6"},
{:servito, github: "marcelog/servito", only: :test}
{:xml_builder, "~> 0.0.8"},
{:servito, github: "marcelog/servito", only: :test, tag: "v0.0.4"}
]
end
end
37 changes: 20 additions & 17 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
%{"coverex": {:hex, :coverex, "1.4.3"},
"cowboy": {:hex, :cowboy, "1.0.0"},
"cowlib": {:hex, :cowlib, "1.0.1"},
"earmark": {:hex, :earmark, "0.1.17"},
"ex_doc": {:hex, :ex_doc, "0.7.3"},
"exjsx": {:hex, :exjsx, "3.1.0"},
"exmerl": {:hex, :exmerl, "0.1.1"},
"hackney": {:hex, :hackney, "1.3.2"},
"httpoison": {:hex, :httpoison, "0.7.2"},
"ibrowse": {:git, "git://github.com/cmullaparthi/ibrowse.git", "fd81d44182507c23445ed720df8c30e2e8da9d9b", [tag: "v4.2"]},
"idna": {:hex, :idna, "1.0.2"},
"jsx": {:hex, :jsx, "2.4.0"},
"poison": {:hex, :poison, "1.4.0"},
"ranch": {:hex, :ranch, "1.0.0"},
"servito": {:git, "git://github.com/marcelog/servito.git", "83dc578abe90c9f383d5785ff8e42613c972eea2", []},
"ssl_verify_hostname": {:hex, :ssl_verify_hostname, "1.0.5"},
"xml_builder": {:hex, :xml_builder, "0.0.6"}}
%{"certifi": {:hex, :certifi, "0.4.0", "a7966efb868b179023618d29a407548f70c52466bf1849b9e8ebd0e34b7ea11f", [:rebar3], []},
"coverex": {:hex, :coverex, "1.4.9", "5f923d9fa5d50cf0eea40a55940cfc7dbf73138fb4dbab565c54d7f2e8724722", [:mix], [{:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}, {:httpoison, "~> 0.8", [hex: :httpoison, optional: false]}]},
"cowboy": {:hex, :cowboy, "1.0.4", "a324a8df9f2316c833a470d918aaf73ae894278b8aa6226ce7a9bf699388f878", [:rebar, :make], [{:cowlib, "~> 1.0.0", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.0", [hex: :ranch, optional: false]}]},
"cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []},
"earmark": {:hex, :earmark, "0.2.1", "ba6d26ceb16106d069b289df66751734802777a3cbb6787026dd800ffeb850f3", [:mix], []},
"ex_doc": {:hex, :ex_doc, "0.12.0", "b774aabfede4af31c0301aece12371cbd25995a21bb3d71d66f5c2fe074c603f", [:mix], [{:earmark, "~> 0.2", [hex: :earmark, optional: false]}]},
"exjsx": {:hex, :exjsx, "3.2.0", "7136cc739ace295fc74c378f33699e5145bead4fdc1b4799822d0287489136fb", [:mix], [{:jsx, "~> 2.6.2", [hex: :jsx, optional: false]}]},
"exmerl": {:hex, :exmerl, "0.1.1", "9c9f426b947f483c4e09fa1557b0cb9ac8979d6776d5fc5b273feca0d0e6e7db", [:make, :mix], []},
"hackney": {:hex, :hackney, "1.6.0", "8d1e9440c9edf23bf5e5e2fe0c71de03eb265103b72901337394c840eec679ac", [:rebar3], [{:ssl_verify_fun, "1.1.0", [hex: :ssl_verify_fun, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:certifi, "0.4.0", [hex: :certifi, optional: false]}]},
"httpoison": {:hex, :httpoison, "0.8.3", "b675a3fdc839a0b8d7a285c6b3747d6d596ae70b6ccb762233a990d7289ccae4", [:mix], [{:hackney, "~> 1.6.0", [hex: :hackney, optional: false]}]},
"ibrowse": {:git, "https://github.com/cmullaparthi/ibrowse.git", "b28542d1e326ba44bcfaf7fd6d3c7f8761d20f08", [tag: "v4.3"]},
"idna": {:hex, :idna, "1.2.0", "ac62ee99da068f43c50dc69acf700e03a62a348360126260e87f2b54eced86b2", [:rebar3], []},
"jsx": {:hex, :jsx, "2.6.2", "213721e058da0587a4bce3cc8a00ff6684ced229c8f9223245c6ff2c88fbaa5a", [:mix, :rebar], []},
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
"mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
"poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], []},
"ranch": {:hex, :ranch, "1.2.1", "a6fb992c10f2187b46ffd17ce398ddf8a54f691b81768f9ef5f461ea7e28c762", [:make], []},
"servito": {:git, "https://github.com/marcelog/servito.git", "a9129246ba5c1f471f342893264dc8e086c19368", [tag: "v0.0.4"]},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.0", "edee20847c42e379bf91261db474ffbe373f8acb56e9079acb6038d4e0bf414f", [:rebar, :make], []},
"xml_builder": {:hex, :xml_builder, "0.0.8", "dea10735e15c91e24582e41ee2d3282b7f0177a5b42d6268096a6221ba83226f", [:mix], []}}

0 comments on commit 83a2dc1

Please sign in to comment.