projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chore/mix-version-bump' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index b28c65694cf378752b9368f5f5721ffdfaf48d21..bb86c38d0c1ea9269ea2ddca10cf76546fc53fc4 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("
1.1
.50"),
+ version: version("
2.0
.50"),
elixir: "~> 1.8",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.8",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@
-117,7
+117,7
@@
defmodule Pleroma.Mixfile do
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
- {:cachex, "~> 3.
0.
2"},
+ {:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.3", override: true},
{:jason, "~> 1.0"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.3", override: true},
{:jason, "~> 1.0"},
@@
-139,8
+139,8
@@
defmodule Pleroma.Mixfile do
{:phoenix_swoosh, "~> 0.2"},
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
{:phoenix_swoosh, "~> 0.2"},
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
- {:floki, "~> 0.23.0"},
{:ex_syslogger, "~> 1.4"},
{:ex_syslogger, "~> 1.4"},
+ {:floki, "~> 0.25"},
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
{:auto_linker,
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
{:auto_linker,