jenkins-bot has submitted this change and it was merged.
Change subject: Update to data-values/javascript 0.7.0
......................................................................
Update to data-values/javascript 0.7.0
Note: I'm not sure if the added dependency in the resources.php file is
actually needed. But on the other hand, if that's not needed, why is the
component even mentioned in the composer.json file? I think it should be
in both files or in none.
Bug: T99231
Change-Id: Ife23d87ac400ce4469d0f4997ca65818c493276a
---
M README.md
M WikibaseJavaScriptApi.php
M composer.json
M src/resources.php
4 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index b7a0098..0f63351 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@
## Release notes
+### 1.0.3 (2015-05-21)
+
+* Made installable with DataValues JavaScript 0.7.0.
+
### 1.0.2 (2015-05-20)
#### Enhancements
diff --git a/WikibaseJavaScriptApi.php b/WikibaseJavaScriptApi.php
index cce7f66..2ac9957 100644
--- a/WikibaseJavaScriptApi.php
+++ b/WikibaseJavaScriptApi.php
@@ -5,7 +5,7 @@
return 1;
}
-define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '1.0.3-dev' );
+define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '1.0.3' );
// Include the composer autoloader if it is present.
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
diff --git a/composer.json b/composer.json
index 3d33f20..2f8723d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "wikibase/javascript-api",
"description": "Wikibase API client in JavaScript",
"require": {
- "data-values/javascript": "~0.6.0"
+ "data-values/javascript": "~0.6.0|~0.7.0"
},
"license": "GPL-2.0+",
"authors": [
diff --git a/src/resources.php b/src/resources.php
index 7dcde07..00173f5 100644
--- a/src/resources.php
+++ b/src/resources.php
@@ -1,4 +1,5 @@
<?php
+
/**
* @license GNU GPL v2+
* @author Adrian Lang <[email protected]>
@@ -27,6 +28,7 @@
'FormatValueCaller.js',
),
'dependencies' => array(
+ 'dataValues.DataValue',
'wikibase.api.__namespace',
'wikibase.api.RepoApiError',
)
--
To view, visit https://gerrit.wikimedia.org/r/211111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife23d87ac400ce4469d0f4997ca65818c493276a
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
