Merge pull request #86 from amzn/pre_1.1.2

1.1.2 Version upgrade
amzn · Jul 26, 2017 · 5a775d2 · 5a775d2
2 parents b8c1407 + adac322
commit 5a775d2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-and-login-magento-2-module",
   "description": "Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon",
   "type": "magento2-module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": [
     "Apache-2.0"
   ],

diff --git a/marketplace-composer.json b/marketplace-composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-and-login-magento-2-module",
   "description": "Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon",
   "type": "metapackage",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": [
     "Apache-2.0"
   ],

diff --git a/src/Core/composer.json b/src/Core/composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-and-login-with-amazon-core-module",
   "description": "Shared functionality for Amazon Pay and Login with Amazon modules",
   "type": "magento2-module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": [
     "Apache-2.0"
   ],

diff --git a/src/Login/composer.json b/src/Login/composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/login-with-amazon-module",
   "description": "Login with Amazon module",
   "type": "magento2-module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": [
     "Apache-2.0"
   ],

diff --git a/src/Payment/Helper/Data.php b/src/Payment/Helper/Data.php
@@ -45,6 +45,7 @@ public function __construct(Context $context, ModuleListInterface $moduleList)
      */
     public function getModuleVersion()
     {
-        return $this->moduleList->getOne(static::MODULE_CODE)['setup_version'];
+        // there is a similar function here: src/Core/Block/Adminhtml/System/Config/Form/Version.php, please update in parallel
+        return "1.1.2";
     }
 }
diff --git a/src/Payment/composer.json b/src/Payment/composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-module",
   "description": "Amazon Pay module",
   "type": "magento2-module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": [
     "Apache-2.0"
   ],