From a08fd0b7c78dca73b7b7e92caed5809fbabf798a Mon Sep 17 00:00:00 2001
From: Neil Menne <nhm@neilmenne.com>
Date: Thu, 13 Sep 2018 19:10:18 -0400
Subject: [PATCH 1/3] Resolves #19: elixir 1.7, __STACKTRACE__, and fix event
 typespec

---
 lib/maestro/aggregate/root.ex | 12 ++++++------
 lib/maestro/types/event.ex    |  1 +
 mix.exs                       |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/maestro/aggregate/root.ex b/lib/maestro/aggregate/root.ex
index 51b8082..eeec0bd 100644
--- a/lib/maestro/aggregate/root.ex
+++ b/lib/maestro/aggregate/root.ex
@@ -98,7 +98,7 @@ defmodule Maestro.Aggregate.Root do
           Root.persist_snapshot(snap)
         end
       rescue
-        err -> {:error, err, System.stacktrace()}
+        err -> {:error, err, __STACKTRACE__}
       end
 
       def call(agg_id, msg) do
@@ -146,7 +146,7 @@ defmodule Maestro.Aggregate.Root do
         {:reply, {:ok, agg.state}, agg}
       rescue
         err ->
-          {:reply, {:error, err, System.stacktrace()}, agg}
+          {:reply, {:error, err, __STACKTRACE__}, agg}
       end
 
       def handle_call(:get_current, _from, agg) do
@@ -156,20 +156,20 @@ defmodule Maestro.Aggregate.Root do
       def handle_call({:replay, seq}, _from, agg) do
         {:reply, {:ok, Root.replay(agg, seq)}, agg}
       rescue
-        err -> {:reply, {:error, err, System.stacktrace()}, agg}
+        err -> {:reply, {:error, err, __STACKTRACE__}, agg}
       end
 
       def handle_call(:get_snapshot, _from, agg) do
         body = prepare_snapshot(agg.state)
         {:reply, {:ok, Root.to_snapshot(agg, body)}, agg}
       rescue
-        err -> {:reply, {:error, err, System.stacktrace()}, agg}
+        err -> {:reply, {:error, err, __STACKTRACE__}, agg}
       end
 
       def handle_call({:eval_command, command}, _from, agg) do
         {:reply, :ok, Root.eval_command(agg, command)}
       rescue
-        err -> {:reply, {:error, err, System.stacktrace()}, agg}
+        err -> {:reply, {:error, err, __STACKTRACE__}, agg}
       end
 
       def handle_info(:init, agg), do: {:noreply, Root.update_aggregate(agg)}
@@ -411,7 +411,7 @@ defmodule Maestro.Aggregate.Root do
       {:module, module} -> module
     end
   rescue
-    _ -> reraise(InvalidHandlerError, [type: type], System.stacktrace())
+    _ -> reraise(InvalidHandlerError, [type: type], __STACKTRACE__)
   end
 
   @doc """
diff --git a/lib/maestro/types/event.ex b/lib/maestro/types/event.ex
index c133e94..7bdd097 100644
--- a/lib/maestro/types/event.ex
+++ b/lib/maestro/types/event.ex
@@ -23,6 +23,7 @@ defmodule Maestro.Types.Event do
           timestamp: HLClock.Timestamp.t(),
           aggregate_id: aggregate_id(),
           sequence: sequence(),
+          type: String.t(),
           body: map()
         }
 
diff --git a/mix.exs b/mix.exs
index c40c213..506df27 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,14 +1,14 @@
 defmodule Maestro.Mixfile do
   use Mix.Project
 
-  @version "0.2.0"
+  @version "0.2.1"
   @source_url "https://github.com/toniqsystems/maestro"
 
   def project do
     [
       app: :maestro,
       version: @version,
-      elixir: "~> 1.6",
+      elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),

From de4392f5ceb1d5b4219640945b86fe69595e317b Mon Sep 17 00:00:00 2001
From: Neil Menne <nhm@neilmenne.com>
Date: Thu, 13 Sep 2018 19:21:55 -0400
Subject: [PATCH 2/3] inform travis of the move to 1.7

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1329082..814551f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: elixir
 elixir:
-  - 1.6.0
+  - 1.7.0
 otp_release:
-  - 20.0
+  - 21.0
 
 services:
   - postgresql

From 605128af0540e2cbf7bc750c2320c2c9132e660d Mon Sep 17 00:00:00 2001
From: Neil Menne <nhm@neilmenne.com>
Date: Thu, 13 Sep 2018 20:11:45 -0400
Subject: [PATCH 3/3] the waiting game

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 814551f..9465696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,5 +15,5 @@ script:
   - "mix format --check-formatted"
   - "mix test"
   - "mix credo --strict"
-  - "travis_wait mix dialyzer --halt-exit-status"
+  - "travis_wait 30 mix dialyzer --halt-exit-status"
   - "mix coveralls.travis"