diff --git a/Makefile b/Makefile index 922e6f8..9ea9795 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ monorepo-merge: .PHONY: monorepo-release-% monorepo-release-%: git update-index --really-refresh > /dev/null; git diff-index --quiet HEAD || (echo "Working directory is not clean, aborting" && exit 1) - [ $(git branch --show-current) = 'main' ] || (echo "Not on main branch, aborting" && exit 1) + [ $$(git branch --show-current) == main ] || (echo "Not on main branch, aborting" && exit 1) $(PHP) vendor/bin/monorepo-builder release $* git switch -c release/$* git add . diff --git a/composer.json b/composer.json index be6d1be..ca6bfa3 100644 --- a/composer.json +++ b/composer.json @@ -96,16 +96,16 @@ } }, "replace": { - "rekalogika/rekapager-adapter-common": "0.13.3", - "rekalogika/rekapager-api-platform": "0.13.3", - "rekalogika/rekapager-bundle": "0.13.3", - "rekalogika/rekapager-contracts": "0.13.3", - "rekalogika/rekapager-core": "0.13.3", - "rekalogika/rekapager-doctrine-collections-adapter": "0.13.3", - "rekalogika/rekapager-doctrine-orm-adapter": "0.13.3", - "rekalogika/rekapager-keyset-pagination": "0.13.3", - "rekalogika/rekapager-offset-pagination": "0.13.3", - "rekalogika/rekapager-pagerfanta-adapter": "0.13.3", - "rekalogika/rekapager-symfony-bridge": "0.13.3" + "rekalogika/rekapager-adapter-common": "0.14.0", + "rekalogika/rekapager-api-platform": "0.14.0", + "rekalogika/rekapager-bundle": "0.14.0", + "rekalogika/rekapager-contracts": "0.14.0", + "rekalogika/rekapager-core": "0.14.0", + "rekalogika/rekapager-doctrine-collections-adapter": "0.14.0", + "rekalogika/rekapager-doctrine-orm-adapter": "0.14.0", + "rekalogika/rekapager-keyset-pagination": "0.14.0", + "rekalogika/rekapager-offset-pagination": "0.14.0", + "rekalogika/rekapager-pagerfanta-adapter": "0.14.0", + "rekalogika/rekapager-symfony-bridge": "0.14.0" } } diff --git a/packages/rekapager-api-platform/composer.json b/packages/rekapager-api-platform/composer.json index dc3af74..347546c 100644 --- a/packages/rekapager-api-platform/composer.json +++ b/packages/rekapager-api-platform/composer.json @@ -31,9 +31,9 @@ "php": "^8.2", "api-platform/core": "^3.2", "psr/container": "^2.0", - "rekalogika/rekapager-contracts": "^0.13.3", - "rekalogika/rekapager-core": "^0.13.3", - "rekalogika/rekapager-symfony-bridge": "^0.13.3", + "rekalogika/rekapager-contracts": "^0.14", + "rekalogika/rekapager-core": "^0.14", + "rekalogika/rekapager-symfony-bridge": "^0.14", "symfony/config": "^6.4 || ^7.0", "symfony/dependency-injection": "^6.4 || ^7.0", "symfony/flex": "^2.4", diff --git a/packages/rekapager-bundle/composer.json b/packages/rekapager-bundle/composer.json index 2adbadb..9f45c78 100644 --- a/packages/rekapager-bundle/composer.json +++ b/packages/rekapager-bundle/composer.json @@ -29,9 +29,9 @@ "require": { "php": "^8.2", "psr/container": "^2.0", - "rekalogika/rekapager-contracts": "^0.13.3", - "rekalogika/rekapager-core": "^0.13.3", - "rekalogika/rekapager-symfony-bridge": "^0.13.3", + "rekalogika/rekapager-contracts": "^0.14", + "rekalogika/rekapager-core": "^0.14", + "rekalogika/rekapager-symfony-bridge": "^0.14", "symfony/config": "^6.4 || ^7.0", "symfony/dependency-injection": "^6.4 || ^7.0", "symfony/flex": "^2.4", diff --git a/packages/rekapager-core/composer.json b/packages/rekapager-core/composer.json index 6e16bf8..277405f 100644 --- a/packages/rekapager-core/composer.json +++ b/packages/rekapager-core/composer.json @@ -24,6 +24,6 @@ }, "require": { "php": "^8.2", - "rekalogika/rekapager-contracts": "^0.13.3" + "rekalogika/rekapager-contracts": "^0.14" } } diff --git a/packages/rekapager-doctrine-collections-adapter/composer.json b/packages/rekapager-doctrine-collections-adapter/composer.json index 0b2b68a..3729b75 100644 --- a/packages/rekapager-doctrine-collections-adapter/composer.json +++ b/packages/rekapager-doctrine-collections-adapter/composer.json @@ -29,8 +29,8 @@ "require": { "php": "^8.2", "doctrine/collections": "^2.2", - "rekalogika/rekapager-adapter-common": "^0.13.3", - "rekalogika/rekapager-keyset-pagination": "^0.13.3", - "rekalogika/rekapager-offset-pagination": "^0.13.3" + "rekalogika/rekapager-adapter-common": "^0.14", + "rekalogika/rekapager-keyset-pagination": "^0.14", + "rekalogika/rekapager-offset-pagination": "^0.14" } } diff --git a/packages/rekapager-doctrine-orm-adapter/composer.json b/packages/rekapager-doctrine-orm-adapter/composer.json index 83d3533..83f7959 100644 --- a/packages/rekapager-doctrine-orm-adapter/composer.json +++ b/packages/rekapager-doctrine-orm-adapter/composer.json @@ -30,7 +30,7 @@ "php": "^8.2", "doctrine/orm": "^2.14 || ^3.0", "doctrine/collections": "^2.2", - "rekalogika/rekapager-adapter-common": "^0.13.3", - "rekalogika/rekapager-keyset-pagination": "^0.13.3" + "rekalogika/rekapager-adapter-common": "^0.14", + "rekalogika/rekapager-keyset-pagination": "^0.14" } } diff --git a/packages/rekapager-keyset-pagination/composer.json b/packages/rekapager-keyset-pagination/composer.json index 6c727cf..bc528aa 100644 --- a/packages/rekapager-keyset-pagination/composer.json +++ b/packages/rekapager-keyset-pagination/composer.json @@ -24,7 +24,7 @@ }, "require": { "php": "^8.2", - "rekalogika/rekapager-contracts": "^0.13.3", + "rekalogika/rekapager-contracts": "^0.14", "spomky-labs/base64url": "^2.0" } } diff --git a/packages/rekapager-offset-pagination/composer.json b/packages/rekapager-offset-pagination/composer.json index 750e2d1..f490453 100644 --- a/packages/rekapager-offset-pagination/composer.json +++ b/packages/rekapager-offset-pagination/composer.json @@ -24,6 +24,6 @@ }, "require": { "php": "^8.2", - "rekalogika/rekapager-contracts": "^0.13.3" + "rekalogika/rekapager-contracts": "^0.14" } } diff --git a/packages/rekapager-pagerfanta-adapter/composer.json b/packages/rekapager-pagerfanta-adapter/composer.json index 66e7697..7a6dd16 100644 --- a/packages/rekapager-pagerfanta-adapter/composer.json +++ b/packages/rekapager-pagerfanta-adapter/composer.json @@ -25,8 +25,8 @@ }, "require": { "php": "^8.2", - "rekalogika/rekapager-adapter-common": "^0.13.3", - "rekalogika/rekapager-contracts": "^0.13.3", - "rekalogika/rekapager-offset-pagination": "^0.13.3" + "rekalogika/rekapager-adapter-common": "^0.14", + "rekalogika/rekapager-contracts": "^0.14", + "rekalogika/rekapager-offset-pagination": "^0.14" } } diff --git a/packages/rekapager-symfony-bridge/composer.json b/packages/rekapager-symfony-bridge/composer.json index 9b5826a..88778d3 100644 --- a/packages/rekapager-symfony-bridge/composer.json +++ b/packages/rekapager-symfony-bridge/composer.json @@ -26,8 +26,8 @@ }, "require": { "php": "^8.2", - "rekalogika/rekapager-contracts": "^0.13.3", - "rekalogika/rekapager-core": "^0.13.3", + "rekalogika/rekapager-contracts": "^0.14", + "rekalogika/rekapager-core": "^0.14", "symfony/config": "^6.4 || ^7.0", "symfony/dependency-injection": "^6.4 || ^7.0" }