Merge pull request 'Update elixir versions' (#512) from norm/akkoma:update-elixir...

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/512

diff --git a/Dockerfile b/Dockerfile
index 0551a4c9ea160d17da5cbf7e19bab3aed75d2da3..c6506c48c5aa2920ddc6a9b1569aa2ea31626fb8 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hexpm/elixir:1.13.4-erlang-24.3.4.5-alpine-3.15.6
+FROM hexpm/elixir:1.14.3-erlang-25.3-alpine-3.17.2
 
 ENV MIX_ENV=prod
 ENV ERL_EPMD_ADDRESS=127.0.0.1

diff --git a/docs/docs/installation/generic_dependencies.include b/docs/docs/installation/generic_dependencies.include
index 68c61129ad2392589cbf3f619cc6e07df152c3c8..d8cf9f9dafdd7476e0b17bd303f072279c8290da 100644 (file)
--- a/docs/docs/installation/generic_dependencies.include
+++ b/docs/docs/installation/generic_dependencies.include
@@ -1,8 +1,8 @@
 ## Required dependencies
 
 * PostgreSQL 9.6+
-* Elixir 1.12+ (1.13+ recommended)
-* Erlang OTP 22.2+
+* Elixir 1.14+
+* Erlang OTP 24+
 * git
 * file / libmagic
 * gcc (clang might also work)

diff --git a/elixir_buildpack.config b/elixir_buildpack.config
index 946408c12fd6e9bf254895a7a24de88a4785ecd5..ee9e051a66c894468c4d03d28d12827cc8ce8226 100644 (file)
--- a/elixir_buildpack.config
+++ b/elixir_buildpack.config
@@ -1,2 +1,2 @@
-elixir_version=1.9.4
-erlang_version=22.3.4.1
+elixir_version=1.14.3
+erlang_version=25.3

diff --git a/mix.exs b/mix.exs
index 098ea15b036150740780a1526661e424daf93a8d..aa1dde6673862380b9bca63421eb25820bf232c6 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do
     [
       app: :pleroma,
       version: version("3.7.1"),
-      elixir: "~> 1.12",
+      elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix] ++ Mix.compilers(),
       elixirc_options: [warnings_as_errors: warnings_as_errors()],