From 002a81eeef68052e635c6eb315f488dfbfac6cdd Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 23 Jul 2021 22:46:13 +0200 Subject: [PATCH] replace fxp/composer-asset-plugin with asset-packagist.org to install bower and npm assets supposed to work with composer > 1.8.7 --- composer.json | 13 ++++++++----- composer.lock | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index aaab376e55..da2496f384 100644 --- a/composer.json +++ b/composer.json @@ -38,9 +38,13 @@ "issuses": "https://my.egroupware.org" }, "repositories": [ - { - "type": "pear", - "url": "https://pear.horde.org" + { + "type": "composer", + "url": "https://asset-packagist.org" + }, + { + "type": "pear", + "url": "https://pear.horde.org" }, { "type": "vcs", @@ -77,7 +81,6 @@ "egroupware/collabora": "self.version", "egroupware/guzzlestream": "dev-master", "egroupware/icalendar": "^2.1.9", - "egroupware/imap-client": "^2.30.2", "egroupware/magicsuggest": "^2.1", "egroupware/news_admin": "self.version", "egroupware/openid": "self.version", @@ -90,11 +93,11 @@ "egroupware/tracker": "self.version", "egroupware/webdav": "dev-master", "egroupware/z-push-dev": "^2.5", - "fxp/composer-asset-plugin": "^1.2.2", "giggsey/libphonenumber-for-php": "^8.12", "npm-asset/as-jqplot": "1.0.*", "npm-asset/gridster": "0.5.*", "oomphinc/composer-installers-extender": "^1.1", + "pear-pear.horde.org/horde_imap_client": "^2.30.3", "pear-pear.horde.org/horde_compress": "^2.0.8", "pear-pear.horde.org/horde_crypt": "^2.7.9", "pear-pear.horde.org/horde_mail": "^2.1.2", diff --git a/composer.lock b/composer.lock index 23c99009ef..e1ba6d2227 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7d4e11d13ad751c36ea277a8546ae450", + "content-hash": "3f243434358f300d4fda0859f4e4b0e9", "packages": [ { "name": "adldap2/adldap2",