From: Kunal Mehta <legoktm@member.fsf.org>
Date: Wed, 3 Jan 2018 20:32:07 +0000 (-0800)
Subject: Bump dev dependency composer/spdx-licenses to 1.2.0
X-Git-Tag: 1.31.0-rc.0~1005
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=689acef53fb969b9985743c821320724e13e7704

Bump dev dependency composer/spdx-licenses to 1.2.0

Notably, this includes support for SPDX 3.0.

https://github.com/composer/spdx-licenses/compare/1.1.4...1.2.0

Deprecated license identifiers will still be accepted, but in the future we
can start warning that they are deprecated.

Bug: T183858
Change-Id: I819ce40f24d8447a20c266b2f1fa454e966dd5a5
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index a496b02da9..4eb4c013be 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -42,6 +42,8 @@ production.
 
 ==== Upgraded external libraries ====
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
+* Updated composer/spdx-licenses from 1.1.4 to
+  1.2.0 (development dependency).
 * …
 
 ==== New external libraries ====
diff --git a/composer.json b/composer.json
index ee050d5fec..6b3e8f74a5 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
 		"zordius/lightncandy": "0.23"
 	},
 	"require-dev": {
-		"composer/spdx-licenses": "1.1.4",
+		"composer/spdx-licenses": "1.2.0",
 		"hamcrest/hamcrest-php": "^2.0",
 		"jakub-onderka/php-parallel-lint": "0.9.2",
 		"jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",