From 5df33995d5213a6f0a9b85fcb21c2d4574ff8cbe Mon Sep 17 00:00:00 2001
From: Mateusz Zalewski <zaleslaw@gmail.com>
Date: Fri, 18 Jun 2021 11:57:28 +0200
Subject: [PATCH 1/2] Conflict with SyliusInvoicingPlugin below 0.16.0

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 37f9a5ef..050d5876 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,8 @@
     },
     "conflict": {
         "symfony/doctrine-bridge": "4.4.16",
-        "doctrine/doctrine-bundle": "2.3.0"
+        "doctrine/doctrine-bundle": "2.3.0",
+        "sylius/invoicing-plugin": "<0.16.0"
     },
     "autoload": {
         "psr-4": {

From 76dfc7ca9c4e1958a811b789b4aec53490c6c5cd Mon Sep 17 00:00:00 2001
From: Mateusz Zalewski <zaleslaw@gmail.com>
Date: Fri, 9 Jul 2021 14:13:45 +0200
Subject: [PATCH 2/2] Fix build

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8b72c43..214641cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
                 node: ["10.x"]
                 mysql: ["5.7", "8.0"]
                 symfony: ["^4.4", "^5.2"]
-                sylius: ["~1.8.0", "~1.9.0", "~1.10@dev"]
+                sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]
 
                 exclude:
                     -
@@ -33,7 +33,7 @@ jobs:
                         symfony: "^5.2"
                     -
                         php: "7.3"
-                        sylius: "~1.10@dev"
+                        sylius: "~1.10.0"
                     -
                         php: "8.0"
                         sylius: "~1.8.0"