updated composer plugin wikimedia/composer-merge-plugin

This commit is contained in:
Bachir Soussi Chiadmi 2021-06-24 21:24:26 +02:00
parent 82ac176a50
commit f9ede630e5
2 changed files with 16 additions and 16 deletions

View File

@ -100,7 +100,7 @@
"wa72/htmlpagedom": "1.3.*",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
"wikimedia/composer-merge-plugin": "^1.4",
"wikimedia/composer-merge-plugin": "^2.0",
"zaporylie/composer-drupal-optimizations": "^1.0"
},
"require-dev": {

30
composer.lock generated
View File

@ -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": "23c6cb51f19ca9d27cd9298f1d2c8fb8",
"content-hash": "d7c52873417da63b7a9bfa5aad571904",
"packages": [
{
"name": "alchemy/zippy",
@ -19465,38 +19465,38 @@
},
{
"name": "wikimedia/composer-merge-plugin",
"version": "v1.4.1",
"version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/composer-merge-plugin.git",
"reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100"
"reference": "8ca2ed8ab97c8ebce6b39d9943e9909bb4f18912"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
"reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
"url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/8ca2ed8ab97c8ebce6b39d9943e9909bb4f18912",
"reference": "8ca2ed8ab97c8ebce6b39d9943e9909bb4f18912",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0",
"php": ">=5.3.2"
"composer-plugin-api": "^1.1||^2.0",
"php": ">=7.2.0"
},
"require-dev": {
"composer/composer": "~1.0.0",
"jakub-onderka/php-parallel-lint": "~0.8",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "~2.1.0"
"composer/composer": "^1.1||^2.0",
"php-parallel-lint/php-parallel-lint": "~1.1.0",
"phpunit/phpunit": "^8.5||^9.0",
"squizlabs/php_codesniffer": "~3.5.4"
},
"type": "composer-plugin",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
"dev-master": "2.x-dev"
},
"class": "Wikimedia\\Composer\\MergePlugin"
"class": "Wikimedia\\Composer\\Merge\\V2\\MergePlugin"
},
"autoload": {
"psr-4": {
"Wikimedia\\Composer\\": "src/"
"Wikimedia\\Composer\\Merge\\V2\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -19510,7 +19510,7 @@
}
],
"description": "Composer plugin to merge multiple composer.json files",
"time": "2017-04-25T02:31:25+00:00"
"time": "2021-02-24T05:28:06+00:00"
},
{
"name": "zaporylie/composer-drupal-optimizations",