Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
breunigs committed Dec 31, 2023
1 parent feb40ba commit d00ed4c
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
elixir 1.15.7
erlang 26.1.2
elixir 1.16.0
erlang 26.2.1
nodejs 18.14.2
2 changes: 1 addition & 1 deletion lib/basemap/map_matcher.ex
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ defmodule Basemap.MapMatcher.OSRM do
overview: false,
annotations: false,
generate_hints: false,
radiuses: "#{@radius};" |> String.duplicate(length(points)) |> String.slice(0..-2)
radiuses: "#{@radius};" |> String.duplicate(length(points)) |> String.slice(0..-2//1)
]

with {:ok, matches} <-
Expand Down
2 changes: 1 addition & 1 deletion lib/basemap/styles.ex
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ defmodule Basemap.Styles do
defp attribute(data) do
Enum.reduce(Esri.Tiles.attribution(:from_api), data, fn {key, text}, data ->
# encode as string but strip the quotes
text = text |> Jason.encode!() |> String.slice(1..-2)
text = text |> Jason.encode!() |> String.slice(1..-2//1)
String.replace(data, "%%ATTRIBUTION#{key}%%", text)
end)
end
Expand Down
4 changes: 2 additions & 2 deletions lib/data/rough_date.ex
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ defmodule Data.RoughDate do
%__MODULE__{year: get_year(date), quarter: quarter, month: nil, day: nil}

String.match?(date, ~r/^20\d\d-[01]\d$/) ->
{month, ""} = date |> String.slice(5..-1) |> Integer.parse()
{month, ""} = date |> String.slice(5..-1//1) |> Integer.parse()
%__MODULE__{year: get_year(date), quarter: nil, month: month - 1, day: nil}

String.match?(date, ~r/^20\d\d$/) ->
Expand Down Expand Up @@ -58,7 +58,7 @@ defmodule Data.RoughDate do
def range(d, d), do: "#{to_str(d)}"

def range(%{year: y} = from, %{year: y} = to),
do: "#{to_str(from) |> String.slice(0..-6)} bis #{to_str(to)}"
do: "#{to_str(from) |> String.slice(0..-6//1)} bis #{to_str(to)}"

def range(from, to), do: "#{to_str(from)} bis #{to_str(to)}"

Expand Down
2 changes: 1 addition & 1 deletion lib/map/route.ex
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ defmodule Map.Route do
leg = Graph.Pathfinding.dijkstra(graph, from, to) |> warn_on_nil_leg(track, to, from, art)
# this conveniently skips all named "targets" and only returns the actual ways
next_ways = Enum.flat_map(leg, fn wid -> indexed[wid] || [] end) |> Util.compact()
next_nodes = Enum.flat_map(next_ways, fn w -> Enum.slice(w.nodes, 1..-1) end)
next_nodes = Enum.flat_map(next_ways, fn w -> Enum.slice(w.nodes, 1..-1//1) end)

{[next_ways | ways], [next_nodes | nodes]}
end)
Expand Down
2 changes: 1 addition & 1 deletion lib/tool_versions.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defmodule ToolVersions do
@tool_path Path.join([__DIR__, "..", ".tool-versions"])
@extra_versions %{debian: "bullseye-20230612-slim"}
@extra_versions %{debian: "bullseye-20231009-slim"}

@self_path __ENV__.file
def path, do: @self_path
Expand Down
4 changes: 4 additions & 0 deletions lib/util/download.ex
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ defmodule Util.Download do
end
end

# Dialyzer complains about IO.binwrite never returning {:error, _}, which
# seems fishy, since as per Elixir's and Erlang's docs it might.
@dialyzer {:no_match, stream_body: 2}

defp stream_body(ref, handle) do
case :hackney.stream_body(ref) do
{:ok, data} ->
Expand Down
3 changes: 2 additions & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ defmodule Veloroute.MixProject do
dialyzer: :test,
"velo.assets.prepare": :test
],
aliases: aliases()
aliases: aliases(),
compilers: [:leex] ++ Mix.compilers()
]
end

Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
"cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
"dart_sass": {:hex, :dart_sass, "0.7.0", "7979e056cb74fd6843e1c72db763cffc7726a9192a657735b7d24c0d9c26a1ce", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "4a8e70bca41aa00846398abdf5ad8a64d7907a0f7bf40145cd2e40d5971629f2"},
"dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
"dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
"eflame": {:hex, :eflame, "1.0.1", "0664d287e39eef3c413749254b3af5f4f8b00be71c1af67d325331c4890be0fc", [:mix], [], "hexpm", "e0b08854a66f9013129de0b008488f3411ae9b69b902187837f994d7a99cf04e"},
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
"erlexec": {:hex, :erlexec, "2.0.2", "995e40477de94c37ec1264cc3e52eb6273938e80c9bcc4f94110a3f1c0d9aba3", [:rebar3], [], "hexpm", "cc829a7c6c23d399832da2e998ea5ebc552232a6fe3eb1edb400178ec8287dcb"},
Expand Down
2 changes: 1 addition & 1 deletion tools/ffmpeg/Dockerfile.ffmpeg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:testing-slim AS downloader

ARG RAV1E_VERSION=refs/tags/p20230704
ARG RAV1E_VERSION=refs/tags/v0.7.0
ARG RAV1E_REPO=xiph

ARG FFMPEG_VERSION=6.1
Expand Down

0 comments on commit d00ed4c

Please sign in to comment.