Merge branch 'elixir-1.9' into 'develop'

Upgrade to Elixir 1.9 See merge request pleroma/pleroma!2651
2020-06-16 13:18:29 +00:00 · 2020-06-16 13:18:29 +00:00 · 8bfacffabc
commit 8bfacffabc
parent 4baf5ffe73 aca6a7543a
3 changed files with 4 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: elixir:1.8.1
+image: elixir:1.9.4

 variables: &global_variables
  POSTGRES_DB: pleroma_test
--- a/elixir_buildpack.config
+++ b/elixir_buildpack.config
@ -1,2 +1,2 @@
-elixir_version=1.8.2
-erlang_version=21.3.7
+elixir_version=1.9.4
+erlang_version=22.3.4.1
--- a/mix.exs
+++ b/mix.exs
@ -5,7 +5,7 @@ def project do
    [
      app: :pleroma,
      version: version("2.0.50"),
-      elixir: "~> 1.8",
+      elixir: "~> 1.9",
      elixirc_paths: elixirc_paths(Mix.env()),
      compilers: [:phoenix, :gettext] ++ Mix.compilers(),
      elixirc_options: [warnings_as_errors: warnings_as_errors(Mix.env())],