projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove `httpoison` from dependencies
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 0850fad2792221590f2d79d82d918f4b9a2fb9dc..518de590dfb8df999929aaff545713ce74360549 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,7
+4,7
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("
0.9
.0"),
+ version: version("
1.0
.0"),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@
-109,7
+109,6
@@
defmodule Pleroma.Mixfile do
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
- {:httpoison, "~> 1.2.0"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.2"},
{:jason, "~> 1.0"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.2"},
{:jason, "~> 1.0"},
@@
-207,6
+206,15
@@
defmodule Pleroma.Mixfile do
env_name = if Mix.env() != :prod, do: to_string(Mix.env())
env_name = if Mix.env() != :prod, do: to_string(Mix.env())
+ env_override = System.get_env("PLEROMA_BUILD_ENV")
+
+ env_name =
+ if env_override do
+ if env_override != "prod", do: env_override
+ else
+ env_name
+ end
+
build =
[build_name, env_name]
|> Enum.filter(fn string -> string && string != "" end)
build =
[build_name, env_name]
|> Enum.filter(fn string -> string && string != "" end)