Upgrade to Elixir 1.9

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aad28a2d879459c3c7ad3ea9a645239ec3bb49e5..bc7b289a253bcaed86d8a212f340836d6f7d8ec5 100644 (file)
--- 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

diff --git a/elixir_buildpack.config b/elixir_buildpack.config
index c23b08fb852ebc7147dcefff9596300909564c85..946408c12fd6e9bf254895a7a24de88a4785ecd5 100644 (file)
--- 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

diff --git a/mix.exs b/mix.exs
index 03b060bc0ff698c1a0237b38bbc350982edf2a26..6040c994ea4612977d45d60e263ecd8e930d2219 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile 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())],