summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fuchs <steven.fuchs@dockyard.com>2020-06-16 13:18:29 +0000
committerrinpatch <rinpatch@sdf.org>2020-06-16 13:18:29 +0000
commitaca6a7543ae97da2d1af8a6f9c547a0088d9e240 (patch)
tree3cbc33cdde01cd1e03bc7e14f344c89440058b31
parent1e49bfa9acb4176a161181edcaf04e886c638c42 (diff)
downloadpleroma-aca6a7543ae97da2d1af8a6f9c547a0088d9e240.tar.gz
pleroma-aca6a7543ae97da2d1af8a6f9c547a0088d9e240.zip
Upgrade to Elixir 1.9
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--elixir_buildpack.config4
-rw-r--r--mix.exs2
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aad28a2d8..bc7b289a2 100644
--- 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 c23b08fb8..946408c12 100644
--- 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 03b060bc0..6040c994e 100644
--- 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())],