From c754644829bae2453c78693143667e7a42305ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=9Aled=C5=BA?= Date: Thu, 5 May 2022 13:00:11 +0200 Subject: [PATCH] Bump `membrane_core` to 0.10.0. Bump version to 0.6.0 --- README.md | 2 +- mix.exs | 6 +++--- mix.lock | 2 +- test/membrane_funnel_test.exs | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 313e34d..5e88626 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The package can be installed by adding `membrane_funnel_plugin` to your list of ```elixir def deps do [ - {:membrane_funnel_plugin, "~> 0.5.0"} + {:membrane_funnel_plugin, "~> 0.6.0"} ] end ``` diff --git a/mix.exs b/mix.exs index fbe0f2a..a48e739 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Membrane.Funnel.Plugin.Mixfile do use Mix.Project - @version "0.5.0" + @version "0.6.0" @github_url "https://github.com/membraneframework/membrane_funnel_plugin" def project do @@ -36,7 +36,7 @@ defmodule Membrane.Funnel.Plugin.Mixfile do defp deps do [ - {:membrane_core, github: "membraneframework/membrane_core", tag: "v0.9.0-rc.0"}, + {:membrane_core, "~> 0.10.0"}, {:ex_doc, "~> 0.23", only: :dev, runtime: false}, {:dialyxir, "~> 1.0.0", only: :dev, runtime: false}, {:credo, "~> 1.5", only: :dev, runtime: false} @@ -46,7 +46,7 @@ defmodule Membrane.Funnel.Plugin.Mixfile do defp package do [ maintainers: ["Membrane Team"], - licenses: ["Apache 2.0"], + licenses: ["Apache-2.0"], links: %{ "GitHub" => @github_url, "Membrane Framework Homepage" => "https://membraneframework.org" diff --git a/mix.lock b/mix.lock index 8ac8faf..eb7fa4f 100644 --- a/mix.lock +++ b/mix.lock @@ -13,7 +13,7 @@ "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"}, "makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"}, "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"}, - "membrane_core": {:git, "https://github.com/membraneframework/membrane_core.git", "5f5dd761bd2dd980b0b891cb83f6633f893a7c4e", [tag: "v0.9.0-rc.0"]}, + "membrane_core": {:hex, :membrane_core, "0.10.0", "1d010bc632f6abb575c60e37607a0cb56fbf88bbb9d0d78a4b5410611563239a", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 2.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "64d63514aabf71c93136ee86093b7ca60cf4317a09b137e0c08e064caa34636f"}, "nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"}, "numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"}, "qex": {:hex, :qex, "0.5.0", "5a3a9becf67d4006377c4c247ffdaaa8ae5b3634a0caadb788dc24d6125068f4", [:mix], [], "hexpm", "4ad6f6421163cd8204509a119a5c9813cbb969cfb8d802a9dc49b968bffbac2a"}, diff --git a/test/membrane_funnel_test.exs b/test/membrane_funnel_test.exs index a45d659..d0c4032 100644 --- a/test/membrane_funnel_test.exs +++ b/test/membrane_funnel_test.exs @@ -25,8 +25,6 @@ defmodule Membrane.FunnelTest do } |> Testing.Pipeline.start_link() - :ok = Testing.Pipeline.play(pipeline) - assert_receive {Membrane.Testing.Pipeline, ^pipeline, {:playback_state_changed, :prepared, :playing}} @@ -39,7 +37,7 @@ defmodule Membrane.FunnelTest do assert_end_of_stream(pipeline, :sink) refute_sink_buffer(pipeline, :sink, _buffer, 0) - Membrane.Pipeline.stop_and_terminate(pipeline, blocking?: true) + Membrane.Pipeline.terminate(pipeline, blocking?: true) assert_receive {Membrane.Testing.Pipeline, ^pipeline, {:playback_state_changed, :prepared, :stopped}}