update to 2.4.0

raise dependency on psr/container 1.1

8 files changed, 21 insertions, 24 deletions

diff --git a/composer.json b/composer.json
index eecf327..b71a48d 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,8 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "psr/cache": "^1.0",
-        "psr/container": "^1.0",
+        "psr/cache": "^1.0|^2.0|^3.0",
+        "psr/container": "^1.1",
         "psr/event-dispatcher": "^1.0"
     },
     "require-dev": {
@@ -48,9 +48,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         }
     }
 }
diff --git a/php-symfony-contracts2.spec b/php-symfony-contracts2.spec
index 15dc532..9470ded 100644
--- a/php-symfony-contracts2.spec
+++ b/php-symfony-contracts2.spec
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    f7783bdec14b06c323d30a5f74ba70a17ec0ce81
+%global gh_commit    8434102b404d119dcaf98c8fe19a2655573ac17a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     symfony
 %global gh_project   contracts
@@ -25,7 +25,7 @@
 
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.3.1
+Version:        2.4.0
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A set of abstractions extracted out of the Symfony, version %{major}
 
@@ -48,7 +48,7 @@ BuildRequires:  php-zlib
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >=8
 BuildRequires: (php-composer(psr/cache)            >= 1.0  with php-composer(psr/cache)            < 2)
-BuildRequires: (php-composer(psr/container)        >= 1.0  with php-composer(psr/container)        < 2)
+BuildRequires: (php-composer(psr/container)        >= 1.1  with php-composer(psr/container)        < 2)
 BuildRequires: (php-composer(psr/event-dispatcher) >= 1.0  with php-composer(psr/event-dispatcher) < 2)
 # remirepo:5
 %else
@@ -68,8 +68,8 @@ BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
 #        "php": ">=7.2.5"
-#        "psr/cache": "^1.0",
-#        "psr/container": "^1.0",
+#        "psr/cache": "^1.0|^2.0|^3.0",
+#        "psr/container": "^1.1",
 #        "psr/event-dispatcher": "^1.0"
 Requires:       php(language) >= 7.2.5
 # From composer.json, "suggest": {
@@ -81,7 +81,7 @@ Requires:       php(language) >= 7.2.5
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >=8
 Requires:      (php-composer(psr/cache)            >= 1.0  with php-composer(psr/cache)            < 2)
-Requires:      (php-composer(psr/container)        >= 1.0  with php-composer(psr/container)        < 2)
+Requires:      (php-composer(psr/container)        >= 1.1  with php-composer(psr/container)        < 2)
 Requires:      (php-composer(psr/event-dispatcher) >= 1.0  with php-composer(psr/event-dispatcher) < 2)
 # remirepo:5
 %else
@@ -189,6 +189,10 @@ exit $ret
 
 
 %changelog
+* Mon Apr 19 2021 Remi Collet <remi@remirepo.net> - 2.4.0-1
+- update to 2.4.0
+- raise dependency on psr/container 1.1
+
 * Wed Oct 28 2020 Remi Collet <remi@remirepo.net> - 2.3.1-1
 - update to 2.3.1
 - rename to php-symfony-contracts2
diff --git a/src/Cache/composer.json b/src/Cache/composer.json
index f95df70..0f69892 100644
--- a/src/Cache/composer.json
+++ b/src/Cache/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "psr/cache": "^1.0"
+        "psr/cache": "^1.0|^2.0|^3.0"
     },
     "suggest": {
         "symfony/cache-implementation": ""
@@ -27,9 +27,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Deprecation/composer.json b/src/Deprecation/composer.json
index 27aa491..3884889 100644
--- a/src/Deprecation/composer.json
+++ b/src/Deprecation/composer.json
@@ -24,9 +24,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/EventDispatcher/composer.json b/src/EventDispatcher/composer.json
index 36aeed0..9f6dc41 100644
--- a/src/EventDispatcher/composer.json
+++ b/src/EventDispatcher/composer.json
@@ -27,9 +27,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/HttpClient/composer.json b/src/HttpClient/composer.json
index 2dc9990..2633785 100644
--- a/src/HttpClient/composer.json
+++ b/src/HttpClient/composer.json
@@ -26,9 +26,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Service/composer.json b/src/Service/composer.json
index efbf399..353413f 100644
--- a/src/Service/composer.json
+++ b/src/Service/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "psr/container": "^1.0"
+        "psr/container": "^1.1"
     },
     "suggest": {
         "symfony/service-implementation": ""
@@ -27,9 +27,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Translation/composer.json b/src/Translation/composer.json
index 311c38b..00e27f8 100644
--- a/src/Translation/composer.json
+++ b/src/Translation/composer.json
@@ -26,9 +26,8 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "2.3",
         "branch-alias": {
-            "dev-main": "2.3-dev"
+            "dev-main": "2.4-dev"
         },
         "thanks": {
             "name": "symfony/contracts",