From a7f8a4a8a8fdd03e32c1efb8d5e46146702dab96 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 27 Jun 2019 09:46:21 +0300 Subject: [PATCH] bump elixir version to 1.9.0 --- .tool-versions | 2 +- apps/block_scout_web/mix.exs | 2 +- apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex | 7 ++----- apps/ethereum_jsonrpc/mix.exs | 2 +- apps/explorer/mix.exs | 2 +- apps/indexer/mix.exs | 2 +- docs/requirements.md | 2 +- mix.exs | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.tool-versions b/.tool-versions index dc46bc2cfb..71379b2fa7 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -elixir 1.8.1 +elixir 1.9 erlang 21.0.4 nodejs 10.11.0 diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 02e9d203fb..e431d4ecf5 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -15,7 +15,7 @@ defmodule BlockScoutWeb.Mixfile do plt_add_deps: :transitive, ignore_warnings: "../../.dialyzer-ignore" ], - elixir: "~> 1.8", + elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), lockfile: "../../mix.lock", package: package(), diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex index 1301fa5675..dc7f1839a6 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex @@ -88,10 +88,6 @@ defmodule EthereumJSONRPC.Transport do `%{"id" => ..., "error" => reason}`. The transport can also give any `term()` for `reason` if a more specific reason is possible. - """ - @callback json_rpc(request, options) :: {:ok, result} | {:error, reason :: term()} - - @doc """ Runs a batch of Remote Procedure Call (RPC) `request`s with `options`. ## Returns @@ -99,8 +95,9 @@ defmodule EthereumJSONRPC.Transport do * `{:ok, [response]}` unlike `json_rpc(request, options)`, the individual `t:response.t/0` are not unwrapped and it is the callers responsibility to extract the `t:result/0` or error `reason`. * `{:error, reason}` an error that affects *all* `t:request/0`s, such as the batch as a whole being rejected. - """ + @callback json_rpc(request, options) :: {:ok, result} | {:error, reason :: term()} + @callback json_rpc(batch_request, options) :: {:ok, batch_response} | {:error, reason :: term()} @doc """ diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs index a805dbd649..7c2299c4a8 100644 --- a/apps/ethereum_jsonrpc/mix.exs +++ b/apps/ethereum_jsonrpc/mix.exs @@ -15,7 +15,7 @@ defmodule EthereumJsonrpc.MixProject do plt_add_apps: [:mix], ignore_warnings: "../../.dialyzer-ignore" ], - elixir: "~> 1.8", + elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), lockfile: "../../mix.lock", preferred_cli_env: [ diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs index f224471740..65ec9b3771 100644 --- a/apps/explorer/mix.exs +++ b/apps/explorer/mix.exs @@ -15,7 +15,7 @@ defmodule Explorer.Mixfile do plt_add_apps: ~w(ex_unit mix)a, ignore_warnings: "../../.dialyzer-ignore" ], - elixir: "~> 1.8", + elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), lockfile: "../../mix.lock", package: package(), diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs index 9b8bd4d6ed..255aa756a3 100644 --- a/apps/indexer/mix.exs +++ b/apps/indexer/mix.exs @@ -10,7 +10,7 @@ defmodule Indexer.MixProject do deps: deps(), deps_path: "../../deps", description: "Fetches block chain data from on-chain node for later reading with Explorer.", - elixir: "~> 1.8", + elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), lockfile: "../../mix.lock", preferred_cli_env: [ diff --git a/docs/requirements.md b/docs/requirements.md index 2df13c6936..c64558afbc 100644 --- a/docs/requirements.md +++ b/docs/requirements.md @@ -5,7 +5,7 @@ | Dependency | Mac | Linux | |-------------|-----|-------| | [Erlang/OTP 21.0.4](https://github.com/erlang/otp) | `brew install erlang` | [Erlang Install Example](https://github.com/poanetwork/blockscout-terraform/blob/33f68e816e36dc2fb055911fa0372531f0e956e7/modules/stack/libexec/init.sh#L134) | -| [Elixir 1.8.1](https://elixir-lang.org/) | :point_up: | [Elixir Install Example](https://github.com/poanetwork/blockscout-terraform/blob/33f68e816e36dc2fb055911fa0372531f0e956e7/modules/stack/libexec/init.sh#L138) | +| [Elixir 1.9.0](https://elixir-lang.org/) | :point_up: | [Elixir Install Example](https://github.com/poanetwork/blockscout-terraform/blob/33f68e816e36dc2fb055911fa0372531f0e956e7/modules/stack/libexec/init.sh#L138) | | [Postgres 10.3](https://www.postgresql.org/) | `brew install postgresql` | [Postgres Install Example](https://github.com/poanetwork/blockscout-terraform/blob/33f68e816e36dc2fb055911fa0372531f0e956e7/modules/stack/libexec/init.sh#L187) | | [Node.js 10.x.x](https://nodejs.org/en/) | `brew install node` | [Node.js Install Example](https://github.com/poanetwork/blockscout-terraform/blob/33f68e816e36dc2fb055911fa0372531f0e956e7/modules/stack/libexec/init.sh#L66) | | [Automake](https://www.gnu.org/software/automake/) | `brew install automake` | [Automake Install Example](https://github.com/poanetwork/blockscout-terraform/blob/33f68e816e36dc2fb055911fa0372531f0e956e7/modules/stack/libexec/init.sh#L72) | diff --git a/mix.exs b/mix.exs index 47ee0f7a75..0643a20376 100644 --- a/mix.exs +++ b/mix.exs @@ -13,7 +13,7 @@ defmodule BlockScout.Mixfile do plt_add_apps: ~w(ex_unit mix)a, ignore_warnings: ".dialyzer-ignore" ], - elixir: "~> 1.8", + elixir: "~> 1.9", preferred_cli_env: [ coveralls: :test, "coveralls.detail": :test,