Skip to content

Commit

Permalink
Added HTTPoison back in
Browse files Browse the repository at this point in the history
  • Loading branch information
Callum Barratt committed Mar 10, 2016
1 parent c785734 commit 82e8847
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
29 changes: 13 additions & 16 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ defmodule Callum.Mixfile do
use Mix.Project

def project do
[app: :callum,
version: "0.0.1",
elixir: "~> 1.0",
elixirc_paths: elixirc_paths(Mix.env),
compilers: [:phoenix, :gettext] ++ Mix.compilers,
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,
aliases: aliases,
deps: deps]
[
app: :callum,
version: "0.0.1",
elixir: "~> 1.0",
elixirc_paths: elixirc_paths(Mix.env),
compilers: [:phoenix, :gettext] ++ Mix.compilers,
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,
aliases: aliases,
deps: deps
]
end

def application do
[mod: {Callum, []},
applications: [:phoenix, :phoenix_html, :cowboy, :logger, :gettext,
:phoenix_ecto, :postgrex]]
:phoenix_ecto, :postgrex, :httpoison]]
end

defp elixirc_paths(:test), do: ["lib", "web", "test/support"]
Expand All @@ -30,18 +32,13 @@ defmodule Callum.Mixfile do
{:phoenix_html, "~> 2.3"},
{:phoenix_live_reload, "~> 1.0", only: :dev},
{:gettext, "~> 0.9"},
{:httpoison, "~> 0.8.1"},
{:timex, "~> 1.0.0"},
{:cowboy, "~> 1.0"},
{:ex_machina, "~> 0.6.1", only: :test}
]
end

# Aliases are shortcut or tasks specific to the current project.
# For example, to create, migrate and run the seeds file at once:
#
# $ mix ecto.setup
#
# See the documentation for `Mix` for more info on aliases.
defp aliases do
["ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"]]
Expand Down
1 change: 1 addition & 0 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"fs": {:hex, :fs, "0.9.2"},
"gettext": {:hex, :gettext, "0.10.0"},
"hackney": {:hex, :hackney, "1.4.8"},
"httpoison": {:hex, :httpoison, "0.8.1"},
"idna": {:hex, :idna, "1.0.3"},
"mimerl": {:hex, :mimerl, "1.0.2"},
"phoenix": {:hex, :phoenix, "1.1.4"},
Expand Down

0 comments on commit 82e8847

Please sign in to comment.