From 0030078d28a2a2036110cda1b2902eb5e9d54a6c Mon Sep 17 00:00:00 2001
From: Adam Kuffel <adam@kuffel.eu>
Date: Wed, 19 Feb 2020 21:27:56 +0100
Subject: [PATCH] Removed deprecation warnings for new elixir versions

Removed deprecated warnings, support for elixir 1.4 and updated travis file to test with different elixir versions.
---
 .travis.yml                            | 24 ++++++++++++++++++-----
 lib/ex_crypto.ex                       | 27 +++++++++++++-------------
 lib/ex_public_key.ex                   |  8 ++++----
 lib/ex_public_key/ex_rsa_public_key.ex |  2 +-
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1c6484..6b2781e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,25 @@ before_install:
   - sudo apt-get install -y haveged
 language: elixir
 elixir:
-  - 1.4.2
+  - 1.5.3
+  - 1.6.6
+  - 1.7.2
+  - 1.8.2
+  - 1.9.4
 otp_release:
   - 18.2.1
+  - 20.1
+  - 20.3
+  - 21.3
+  - 22.2
+script:
+  - mix compile --warnings-as-errors
+  - mix test --trace
 matrix:
-  include:
-    - elixir: 1.4.5
-      otp_release: 20.1
-script: mix test --trace
+  exclude:
+    - elixir: 1.5.3
+      otp_release: 21.3
+    - elixir: 1.5.3
+      otp_release: 22.2
+    - elixir: 1.6.6
+      otp_release: 22.2
diff --git a/lib/ex_crypto.ex b/lib/ex_crypto.ex
index 5b1ea57..e3f03f6 100644
--- a/lib/ex_crypto.ex
+++ b/lib/ex_crypto.ex
@@ -19,22 +19,21 @@ defmodule ExCrypto do
   end
 
   defp normalize_error(kind, error, key_and_iv \\ nil) do
-    key_error = test_key_and_iv_bitlength(key_and_iv)
+    try do
+      key_error = test_key_and_iv_bitlength(key_and_iv)
 
-    normalized_result = Exception.normalize(kind, error)
+      cond do
+        key_error ->
+          key_error
 
-    cond do
-      key_error ->
-        key_error
+        %{message: message} = Exception.normalize(kind, error) ->
+          {:error, message}
 
-      %{term: %{message: message}} = normalized_result ->
-        {:error, message}
-
-      %{message: message} = normalized_result ->
-        {:error, message}
-
-      x = Exception.normalize(kind, error) ->
-        {kind, x, System.stacktrace()}
+      end
+    rescue
+      x  ->
+        normalized = Exception.normalize(kind, x)
+        {kind, normalized, System.stacktrace()}
     end
   end
 
@@ -98,7 +97,7 @@ defmodule ExCrypto do
       iex> assert(rand_int < 21)
       true
 
-      iex> rand_int = ExCrypto.rand_int(23, 99)
+      iex> rand_int = ExCrypto.rand_int(23, 98)
       iex> assert(rand_int > 22)
       true
       iex> assert(rand_int < 99)
diff --git a/lib/ex_public_key.ex b/lib/ex_public_key.ex
index 41e21c0..e19d01d 100644
--- a/lib/ex_public_key.ex
+++ b/lib/ex_public_key.ex
@@ -19,10 +19,10 @@ defmodule ExPublicKey do
   end
 
   def normalize_error(kind, error) do
-    case Exception.normalize(kind, error) do
-      %{message: message} ->
-        {:error, message}
-
+    try do
+      %{message: message} = Exception.normalize(kind, error)
+      {:error, message}
+    rescue
       x ->
         {kind, x, System.stacktrace()}
     end
diff --git a/lib/ex_public_key/ex_rsa_public_key.ex b/lib/ex_public_key/ex_rsa_public_key.ex
index 0abbbe8..6ecfbf1 100644
--- a/lib/ex_public_key/ex_rsa_public_key.ex
+++ b/lib/ex_public_key/ex_rsa_public_key.ex
@@ -108,7 +108,7 @@ defmodule ExPublicKey.RSAPublicKey do
     case String.valid?(data) do
       true ->
         String.splitter(data, "", trim: true)
-        |> Enum.chunk(2)
+        |> Enum.chunk_every(2)
         |> Enum.map(fn(chunk_list) ->
           Enum.join(chunk_list, "")
         end)