Merge pull request #86 from nimblehq/release/2.2.1

Release - 2.2.1

.github/workflows/publish_to_hex_pm.yml

@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
 
 jobs:   
@@ -23,7 +23,7 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_api_variant_on_custom_api_project.yml

@@ -3,7 +3,7 @@ name: "Test API variant on custom API project"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
 
@@ -28,7 +28,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_api_variant_on_standard_api_project.yml

@@ -3,7 +3,7 @@ name: "Test API variant on standard API project"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
 
@@ -28,7 +28,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_live_variant_on_custom_liveview_project.yml

@@ -3,7 +3,7 @@ name: "Test Live variant on custom LiveView project"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
   NODE_VERSION: 14
@@ -29,7 +29,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_live_variant_on_standard_liveview_project.yml

@@ -3,7 +3,7 @@ name: "Test Live variant on standard LiveView project"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
   NODE_VERSION: 14
@@ -29,7 +29,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_release_version.yml

@@ -6,7 +6,7 @@ on:
       - 'release/**'
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
 
@@ -19,7 +19,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_template.yml

@@ -3,7 +3,7 @@ name: "Test template"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
 
@@ -16,7 +16,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_variant_on_custom_project.yml

@@ -3,7 +3,7 @@ name: "Test variant on custom Web project"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
   NODE_VERSION: 14
@@ -33,7 +33,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.github/workflows/test_variant_on_standard_project.yml

@@ -3,7 +3,7 @@ name: "Test variant on standard Web project"
 on: push
 
 env:
-  OTP_VERSION: 23.1.5
+  OTP_VERSION: 23.2.1
   ELIXIR_VERSION: 1.11.3
   PHOENIX_VERSION: 1.5.7
   NODE_VERSION: 14
@@ -33,7 +33,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

.tool-versions

@@ -1,2 +1,2 @@
-erlang 23.1.5
+erlang 23.2.1
 elixir 1.11.3-otp-23

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020 Nimble.
+Copyright (c) 2014-2021 Nimble.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -35,7 +35,15 @@ mix nimble.phx.gen.template --live # Apply the LiveView template
 ```
 ## Requirements
 
-NimblePhxGenTemplate has been developed and actively tested with Elixir 1.11+, Erlang/OTP 23.1+ and Phoenix 1.5+. Running NimblePhxGenTemplate currently requires Elixir 1.11+, Erlang/OTP 23.1+ and Phoenix 1.5+.
+NimblePhxGenTemplate has been developed and actively tested with:
+- Elixir 1.11.3
+- Erlang/OTP 23.2.1
+- Phoenix 1.5.7
+
+Running NimblePhxGenTemplate currently requires:
+- Elixir 1.11.3
+- Erlang/OTP 23.2.1
+- Phoenix 1.5.7
 
 ## Contributing
 
@@ -123,7 +131,7 @@ Once the release branch is merged into the `master` branch, Github Action will a
 
 ## License
 
-This project is Copyright (c) 2014-2020 Nimble. It is free software,
+This project is Copyright (c) 2014-2021 Nimble. It is free software,
 and may be redistributed under the terms specified in the [LICENSE] file.
 
 [LICENSE]: /LICENSE

lib/nimble.phx.gen.template/project.ex

@@ -2,14 +2,14 @@ defmodule Nimble.Phx.Gen.Template.Project do
   # Erlang versions: asdf list all erlang
   # Elixir versions: asdf list all elixir
   @default_versions %{
-    erlang_asdf_version: "23.1.5",
+    erlang_asdf_version: "23.2.1",
     elixir_asdf_version: "1.11.3-otp-23",
-    elixir_mix_version: "1.11"
+    elixir_mix_version: "1.11.3"
   }
 
   # Elixir image tags: https://hub.docker.com/r/hexpm/elixir/tags
   @docker_base_images %{
-    build: "hexpm/elixir:1.11.3-erlang-23.1.5-alpine-3.12.1",
+    build: "hexpm/elixir:1.11.3-erlang-23.2.1-alpine-3.12.1",
     app: "alpine:3.12.1"
   }
 

mix.exs

@@ -4,9 +4,9 @@ defmodule NimblePhxGenTemplate.MixProject do
   def project do
     [
       app: :nimble_phx_gen_template,
-      version: "2.2.0",
+      version: "2.2.1",
       description: "Project repository template to set up all public Phoenix projects at Nimble",
-      elixir: "~> 1.11",
+      elixir: "~> 1.11.3",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       deps: deps(),
@@ -30,7 +30,7 @@ defmodule NimblePhxGenTemplate.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:phoenix, "~> 1.5.5"},
+      {:phoenix, "~> 1.5.7"},
       {:jason, "~> 1.2.2"},
       {:httpoison, "~> 1.7.0"},
       {:mimic, "~> 1.3.1", only: :test},

mix.lock

@@ -11,15 +11,15 @@
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.0", "98312c9f0d3730fde4049985a1105da5155bfe5c11e47bdc7406d88e01e4219b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "75ffa34ab1056b7e24844c90bfc62aaf6f3a37a15faa76b07bc5eba27e4a8b4a"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
-  "mime": {:hex, :mime, "1.4.0", "5066f14944b470286146047d2f73518cf5cca82f8e4815cf35d196b58cf07c47", [:mix], [], "hexpm", "75fa42c4228ea9a23f70f123c74ba7cece6a03b1fd474fe13f6a7a85c6ea4ff6"},
+  "mime": {:hex, :mime, "1.5.0", "203ef35ef3389aae6d361918bf3f952fa17a09e8e43b5aa592b93eba05d0fb8d", [:mix], [], "hexpm", "55a94c0f552249fc1a3dd9cd2d3ab9de9d3c89b559c2bd01121f824834f24746"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mimic": {:hex, :mimic, "1.3.1", "ba1c90b851de9065db81b1e3a16f659e53dffb89d2f4d404db06f67d0b990deb", [:mix], [], "hexpm", "51b74ab8009e0673bf68beba6abfce0e5500c8bec3ad27033c4a8dacbc44d55e"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
   "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"},
-  "phoenix": {:hex, :phoenix, "1.5.5", "9a5a197edc1828c5f138a8ef10524dfecc43e36ab435c14578b1e9b4bd98858c", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b10eaf86ad026eafad2ee3dd336f0fb1c95a3711789855d913244e270bde463b"},
+  "phoenix": {:hex, :phoenix, "1.5.7", "2923bb3af924f184459fe4fa4b100bd25fa6468e69b2803dfae82698269aa5e0", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "774cd64417c5a3788414fdbb2be2eb9bcd0c048d9e6ad11a0c1fd67b7c0d0978"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.0.0", "a1ae76717bb168cdeb10ec9d92d1480fec99e3080f011402c0a2d68d47395ffb", [:mix], [], "hexpm", "c52d948c4f261577b9c6fa804be91884b381a7f8f18450c5045975435350f771"},
-  "plug": {:hex, :plug, "1.10.4", "41eba7d1a2d671faaf531fa867645bd5a3dce0957d8e2a3f398ccff7d2ef017f", [:mix], [{:mime, "~> 1.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", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ad1e233fe73d2eec56616568d260777b67f53148a999dc2d048f4eb9778fe4a0"},
-  "plug_crypto": {:hex, :plug_crypto, "1.1.2", "bdd187572cc26dbd95b87136290425f2b580a116d3fb1f564216918c9730d227", [:mix], [], "hexpm", "6b8b608f895b6ffcfad49c37c7883e8df98ae19c6a28113b02aa1e9c5b22d6b5"},
+  "plug": {:hex, :plug, "1.11.0", "f17217525597628298998bc3baed9f8ea1fa3f1160aa9871aee6df47a6e4d38e", [:mix], [{:mime, "~> 1.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", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2d9c633f0499f9dc5c2fd069161af4e2e7756890b81adcbb2ceaa074e8308876"},
+  "plug_crypto": {:hex, :plug_crypto, "1.2.0", "1cb20793aa63a6c619dd18bb33d7a3aa94818e5fd39ad357051a67f26dfa2df6", [:mix], [], "hexpm", "a48b538ae8bf381ffac344520755f3007cc10bd8e90b240af98ea29b69683fc2"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
   "telemetry": {:hex, :telemetry, "0.4.2", "2808c992455e08d6177322f14d3bdb6b625fbcfd233a73505870d8738a2f4599", [:rebar3], [], "hexpm", "2d1419bd9dda6a206d7b5852179511722e2b18812310d304620c7bd92a13fcef"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.5.0", "8516502659002cec19e244ebd90d312183064be95025a319a6c7e89f4bccd65b", [:rebar3], [], "hexpm", "d48d002e15f5cc105a696cf2f1bbb3fc72b4b770a184d8420c8db20da2674b38"},

priv/templates/nimble.phx.gen.template/.github/workflows/test.yml.eex

@@ -26,7 +26,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - uses: actions/setup-elixir@v1
+      - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}

priv/templates/nimble.phx.gen.template/README.md.eex

@@ -8,7 +8,7 @@
 
 ### Erlang & Elixir
 
-* Erlang <%= erlang_version %>+ and Elixir <%= elixir_version %>+
+* Erlang <%= erlang_version %> and Elixir <%= elixir_version %>
 
 * Recommended version manager.
 

test/nimble.phx.gen.template/addons/docker_test.exs

@@ -57,7 +57,7 @@ defmodule Nimble.Phx.Gen.Template.Addons.DockerTest do
         Addons.Docker.apply(project)
 
         assert_file("Dockerfile", fn file ->
-          assert file =~ "FROM hexpm/elixir:1.11.3-erlang-23.1.5-alpine-3.12.1 AS build"
+          assert file =~ "FROM hexpm/elixir:1.11.3-erlang-23.2.1-alpine-3.12.1 AS build"
           assert file =~ "FROM alpine:3.12.1 AS app"
 
           assert file =~

test/nimble.phx.gen.template/addons/elixir_version_test.exs

@@ -11,7 +11,7 @@ defmodule Nimble.Phx.Gen.Template.Addons.ElixirVersionTest do
 
         assert_file(".tool-versions", fn file ->
           assert file =~ """
-                 erlang 23.1.5
+                 erlang 23.2.1
                  elixir 1.11.3-otp-23
                  """
         end)
@@ -26,7 +26,7 @@ defmodule Nimble.Phx.Gen.Template.Addons.ElixirVersionTest do
         Addons.ElixirVersion.apply(project)
 
         assert_file("mix.exs", fn file ->
-          assert file =~ "elixir: \"~> 1.11\","
+          assert file =~ "elixir: \"~> 1.11.3\","
         end)
       end)
     end

test/nimble.phx.gen.template/addons/readme_test.exs

@@ -11,7 +11,7 @@ defmodule Nimble.Phx.Gen.Template.Addons.ReadmeTest do
 
         assert_file("README.md", fn file ->
           assert file =~ """
-                 Erlang 23.1.5+ and Elixir 1.11+
+                 Erlang 23.2.1 and Elixir 1.11.3
                  """
 
           assert file =~ """
@@ -38,7 +38,7 @@ defmodule Nimble.Phx.Gen.Template.Addons.ReadmeTest do
 
         assert_file("README.md", fn file ->
           assert file =~ """
-                 Erlang 23.1.5+ and Elixir 1.11+
+                 Erlang 23.2.1 and Elixir 1.11.3
                  """
 
           refute file =~ """