diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2018-12-27 22:10:39 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2018-12-27 22:10:39 +0000 |
| commit | e1de866f95c7740d64070ff023b4bdcc013decc4 (patch) | |
| tree | 291d635eb0fa6fec006c06a084ec4349a07753ca | |
| parent | bee6acd51dc4e84e44caecf9d123dfff2f640a38 (diff) | |
| parent | d8fd6a1055b3cdb2ba57f6ecb5253b4599a7a03e (diff) | |
| download | pleroma-e1de866f95c7740d64070ff023b4bdcc013decc4.tar.gz | |
Merge branch '396_elixir_1.7' into 'develop'
[#396] Required Elixir ~> 1.7.
Closes #396
See merge request pleroma/pleroma!600
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | mix.exs | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -30,7 +30,7 @@ While we don't provide docker files, other people have written very good ones. T ### Dependencies * Postgresql version 9.6 or newer -* Elixir version 1.5 or newer. If your distribution only has an old version available, check [Elixir's install page](https://elixir-lang.org/install.html) or use a tool like [asdf](https://github.com/asdf-vm/asdf). +* Elixir version 1.7 or newer. If your distribution only has an old version available, check [Elixir's install page](https://elixir-lang.org/install.html) or use a tool like [asdf](https://github.com/asdf-vm/asdf). * Build-essential tools ### Configuration @@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do [ app: :pleroma, version: version("0.9.0"), - elixir: "~> 1.4", + elixir: "~> 1.7", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), elixirc_options: [warnings_as_errors: true], @@ -71,7 +71,7 @@ defmodule Pleroma.Mixfile do {:crypt, git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, {:cors_plug, "~> 1.5"}, - {:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false}, + {:ex_doc, "~> 0.19", only: :dev, runtime: false}, {:web_push_encryption, "~> 0.2.1"}, {:swoosh, "~> 0.20"}, {:gen_smtp, "~> 0.13"}, |