From: Bryan Davis <bd808@wikimedia.org>
Date: Fri, 6 Nov 2015 22:11:35 +0000 (-0700)
Subject: Bump composer-merge-plugin to v1.3.0
X-Git-Tag: 1.31.0-rc.0~9075^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=3f598b50ea8ed5b342d23611ed7d779870a4f7b1;p=lhc%2Fweb%2Fwiklou.git

Bump composer-merge-plugin to v1.3.0

Update composer-merge-plugin and enable the new feature of omitting
"require-dev" sections from merged files. This will help prevent
Composer package conflicts when used with extensions that have dev
requirements which are not reconcilable with those of MediaWiki itself.

Requires: I7453f68e671b9d519ec3f7dfaa22de6ec8f252e9
Change-Id: I768cf21c6601496e34f2b63199df04cbc0090145
---

diff --git a/composer.json b/composer.json
index 78c23cef11..1cdf8136ca 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
 		"wikimedia/base-convert": "1.0.1",
 		"wikimedia/cdb": "1.3.0",
 		"wikimedia/cldr-plural-rule-parser": "1.0.0",
-		"wikimedia/composer-merge-plugin": "1.2.1",
+		"wikimedia/composer-merge-plugin": "1.3.0",
 		"wikimedia/ip-set": "1.0.1",
 		"wikimedia/relpath": "1.0.3",
 		"wikimedia/running-stat": "1.1.0",
@@ -82,7 +82,8 @@
 		"merge-plugin": {
 			"include": [
 				"composer.local.json"
-			]
+			],
+			"merge-dev": false
 		}
 	}
 }