pleroma

commit: 8bfacffabc1325fa908f253358bbe29093622b0a
parent: 4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9
Author: rinpatch <rinpatch@sdf.org>
Date:   Tue, 16 Jun 2020 13:18:29 +0000

Merge branch 'elixir-1.9' into 'develop'

Upgrade to Elixir 1.9

See merge request pleroma/pleroma!2651
Diffstat:
M
.gitlab-ci.yml
2
+-
M
elixir_buildpack.config
4
++--
M
mix.exs
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git 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
@@ -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
@@ -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())],