Skip to content
This repository was archived by the owner on Oct 13, 2021. It is now read-only.

Commit 6b0ca71

Browse files
Bump Elixir/Erlang Versions to 1.12.1/24.0 (#1020)
* Upgrade Elixir/Erlang to 1.12.1/24.0 Why this change is being made: - Earmark (used for markdown parsing) and Poison (json parsing lib) both have changes that require elixir version greater than 1.11. - There are some compiler updates that help with logging/errors/compiler performance at both the elixir and erlang integrations level What were the changes made to support this: - Change some numbers * Update the versions in the mix file * Bump the image for circle to use the right version * Run `mix format` to pass validations!
1 parent 026afc2 commit 6b0ca71

File tree

7 files changed

+10
-14
lines changed

7 files changed

+10
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
build:
44
parallelism: 1
55
docker:
6-
- image: circleci/elixir:1.9.1-node-browsers
6+
- image: circleci/elixir:1.12.1-node-browsers
77
environment:
88
MIX_ENV: test
99
CLIENT_ID: fake

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
erlang 22.0.7
2-
elixir 1.9.1-otp-22
1+
erlang 24.0
2+
elixir 1.12.1-otp-24
33
nodejs 10.10.0

elixir_buildpack.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
erlang_version=22.0.7
2-
elixir_version=1.9.1
1+
erlang_version=24.0
2+
elixir_version=1.12.1
33
always_rebuild=true
44
config_vars_to_export=(DATABASE_URL MANDRILL_KEY URL_PORT SHUBOX_KEY PERMITTED_EMAIL_DOMAIN)

lib/constable/services/slack_hook.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ defmodule Constable.Services.SlackHook do
1010
if interest.slack_channel do
1111
payload = %{
1212
text:
13-
"#{announcement.user.name} posted <#{
14-
announcement_url(ConstableWeb.Endpoint, :show, announcement)
15-
}|#{announcement.title}>",
13+
"#{announcement.user.name} posted <#{announcement_url(ConstableWeb.Endpoint, :show, announcement)}|#{announcement.title}>",
1614
channel: interest.slack_channel
1715
}
1816

mix.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ defmodule Constable.MixProject do
44
def project do
55
[
66
app: :constable,
7-
version: "0.1.0",
8-
elixir: "~> 1.5",
7+
version: "0.2.0",
8+
elixir: "~> 1.12.0",
99
elixirc_paths: elixirc_paths(Mix.env()),
1010
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
1111
build_embedded: Mix.env() == :prod,

mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"plug": {:hex, :plug, "1.12.0", "39dc7f1ef8c46bb1bf6dd8f6a49f526c45b4b92ce553687fd885b559a46d0230", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "5282c76e89efdf43f2e04bd268ca99d738039f9518137f02ff468cee3ba78096"},
4747
"plug_cowboy": {:hex, :plug_cowboy, "2.5.1", "7cc96ff645158a94cf3ec9744464414f02287f832d6847079adfe0b58761cbd0", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "107d0a5865fa92bcb48e631cc0729ae9ccfa0a9f9a1bd8f01acb513abf1c2d64"},
4848
"plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"},
49-
"poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
49+
"poison": {:hex, :poison, "5.0.0", "d2b54589ab4157bbb82ec2050757779bfed724463a544b6e20d79855a9e43b24", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "11dc6117c501b80c62a7594f941d043982a1bd05a1184280c0d9166eb4d8d3fc"},
5050
"poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
5151
"postgrex": {:hex, :postgrex, "0.15.9", "46f8fe6f25711aeb861c4d0ae09780facfdf3adbd2fb5594ead61504dd489bda", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "610719103e4cb2223d4ab78f9f0f3e720320eeca6011415ab4137ddef730adee"},
5252
"quick_alias": {:hex, :quick_alias, "0.1.0", "9a0b11ca0963a88c32d869a55de4037e3e1c7f176ba27f6d7f92acb6e3da5892", [:mix], [], "hexpm", "04ec05426722c1f3d810ebf246ecdf8fa33b6ef56a0ffdff1bca7a8fce844086"},

test/constable_web/controllers/email_reply_controller_test.exs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ defmodule ConstableWeb.EmailReplyTest do
3838
"""
3939

4040
whole_email_with_quoted_text = """
41-
#{user_text}\n> On Oct 16, 2015, at 5:05 PM, Paul Smith (Constable) <constable-40@#{
42-
Constable.Env.get("OUTBOUND_EMAIL_DOMAIN")
43-
}> wrote:\n> \n> \t\n> my text\t\n\n\n
41+
#{user_text}\n> On Oct 16, 2015, at 5:05 PM, Paul Smith (Constable) <constable-40@#{Constable.Env.get("OUTBOUND_EMAIL_DOMAIN")}> wrote:\n> \n> \t\n> my text\t\n\n\n
4442
"""
4543

4644
comment_author = insert(:user)

0 commit comments

Comments
 (0)