Merge pull request #19 from akoutmos/package_updates_and_1.17_fix

Fixing Elixir 1.17 issues and some much needed clean up
akoutmos · Jun 4, 2024 · 9fe485c · 9fe485c
2 parents de927d7 + c51eaeb
commit 9fe485c
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 313 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,9 +6,9 @@ env:
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   static_analysis:
@@ -17,12 +17,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
-          elixir-version: '1.13.3'
-          otp-version: '24.2'
+          elixir-version: "1.16.3"
+          otp-version: "26.2"
       - name: Restore dependencies cache
         uses: actions/cache@v2
         with:
@@ -52,23 +52,26 @@ jobs:
 
     strategy:
       matrix:
-        elixir:
-          - '1.13.3'
-        otp:
-          - '24.2'
+        version:
+          - otp: 26.2
+            elixir: 1.15.8
+          - otp: 26.2
+            elixir: 1.16.3
+          - otp: 27.0
+            elixir: 1.17.0-rc.1
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
-          elixir-version: ${{ matrix.elixir }}
-          otp-version: ${{ matrix.otp }}
+          elixir-version: ${{ matrix.version.elixir }}
+          otp-version: ${{ matrix.version.otp }}
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: 15
+          node-version: 18
       - name: Restore dependencies cache
         uses: actions/cache@v2
         with:

diff --git a/README.md b/README.md
@@ -97,9 +97,9 @@ module path):
     <mj-section>
       <mj-column>
         <mj-divider border-color="#F45E43"></mj-divider>
-        <mj-text font-size="20px" color="#F45E43"
-          >Hello <%= @first_name %> <%= @last_name %>!</mj-text
-        >
+        <mj-text font-size="20px" color="#F45E43">
+          Hello <%= @first_name %> <%= @last_name %>!
+        </mj-text>
       </mj-column>
     </mj-section>
   </mj-body>
@@ -132,9 +132,9 @@ In conjunction with the following template:
     <mj-section>
       <mj-column>
         <mj-divider border-color="#F45E43"></mj-divider>
-        <mj-text font-size="20px" color="#F45E43"
-          >Hello <%= generate_full_name(@first_name, @last_name) %>!</mj-text
-        >
+        <mj-text font-size="20px" color="#F45E43">
+          Hello <%= generate_full_name(@first_name, @last_name) %>!
+        </mj-text>
       </mj-column>
     </mj-section>
   </mj-body>
@@ -183,9 +183,9 @@ And the following template:
     <mj-section>
       <mj-column>
         <mj-divider border-color="#F45E43"></mj-divider>
-        <mj-text font-size="20px" color="#F45E43"
-          >Hello <%= generate_full_name(@first_name, @last_name) %>!</mj-text
-        >
+        <mj-text font-size="20px" color="#F45E43">
+          Hello <%= generate_full_name(@first_name, @last_name) %>!
+        </mj-text>
       </mj-column>
     </mj-section>
   </mj-body>

diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+0.11.0
diff --git a/coveralls.json b/coveralls.json
@@ -1,3 +1,5 @@
 {
-  "skip_files": ["test", "lib/mjml_eex/tokenizer.ex"]
+  "skip_files": [
+    "test"
+  ]
 }
diff --git a/lib/mjml_eex/tokenizer.ex b/lib/mjml_eex/tokenizer.ex
diff --git a/lib/utils.ex b/lib/utils.ex
@@ -43,7 +43,7 @@ defmodule MjmlEEx.Utils do
   """
   def escape_eex_expressions(template) do
     template
-    |> MjmlEEx.Tokenizer.tokenize([])
+    |> EEx.Compiler.tokenize([])
     |> case do
       {:ok, tokens} ->
         reduce_tokens(tokens)