Merge pull request #195 from amzn/pre_1.2.5

Version increase for 1.2.5

README.md

@@ -20,35 +20,3 @@
 ## Installation and Configuration
 
 Please follow the instructions in the [User Guide](https://amzn.github.io/amazon-payments-magento-2-plugin)
-
-## Release Notes
-### v1.1.1 stability
-#### Enhancements:
-        * Display the module version in the admin html
-        * Support for Modernizr 3.x
-        * Added extended support for japanese names
-        * Removed disturbing message for charge on order
-        * Configuration option to supply the store name added
-
-#### Bug Fixes:
-        * Order handling for free orders corrected
-        * Fixed incompatibility on CompleteOrder
-        * Displayed URLs did not take the store-view configured domain into account
-        * Removed unneeded CSS and layout
-        * jQuery storage API not always present
-
-### v1.1.0 Rebrand
-#### Enhancements:
-        * This release does not add any new features
-
-#### Bug Fixes:
-        * This release does not fix any bugs
-
-### v1.0.10 Small fixes
-#### Enhancements:
-   * #31 Scope parameter propagated to the Amazon Pay widgets
-   * #11 Integrate checkout agreement blocks in the checkout
-
-#### Bug Fixes:
-   * #27 Get the payment method from the order instead of the quote
-   * #33 Fix the checkout layout block to be in line with Magento 2.1

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.2.4",
+  "version": "1.2.5",
   "license": [
     "Apache-2.0"
   ],
@@ -18,6 +18,20 @@
     "bex/behat-magento2-init": "dev-master",
     "ciaranmcnulty/behat-stepthroughextension": "dev-master"
   },
+  "require": {
+    "magento/framework": "^100.1.0|^101.0.0",
+    "magento/module-sales": "^100.1.0|^101.0.0",
+    "magento/module-checkout": "^100.1.0|^100.2.0",
+    "magento/module-payment": "^100.1.0|^100.2.0",
+    "magento/module-eav": "^100.1.0|^101.0.0",
+    "magento/module-developer": "^100.1.0|^100.2.0",
+    "magento/module-config": "^100.1.0|^101.0.0",
+    "magento/module-backend": "^100.1.0|100.2.0",
+    "magento/module-quote": "^100.1.0|^101.0.0",
+    "magento/module-customer": "^100.1.0|^101.0.0",
+    "magento/module-store": "^100.1.0|^100.2.0",
+    "amzn/amazon-pay-sdk-php": "^3.2.0"
+  },
   "repositories": [
     {
       "type": "composer",

docs/conf.py

@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.2.4'
+version = u'1.2.5'
 # The full version, including alpha/beta/rc tags.
-release = u'1.2.4'
+release = u'1.2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/installation.rst

@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install
 
 * Sign in to your server via SSH
 * `cd` into you Magento installation directory
-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^1.2.4`
+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^1.2.5`
 * Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`
 * Upgrade the Magento installation: `php bin/magento setup:upgrade`
 * Follow any advice the upgrade routine provides
 
-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^1.2.4` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`
+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^1.2.5` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`
 
 In production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content
 

marketplace-composer.json

@@ -2,13 +2,13 @@
   "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.2.4",
+  "version": "1.2.5",
   "license": [
     "Apache-2.0"
   ],
   "require": {
-    "amzn/amazon-pay-and-login-with-amazon-core-module": "1.2.4",
-    "amzn/login-with-amazon-module": "1.2.4",
-    "amzn/amazon-pay-module": "1.2.4"
+    "amzn/amazon-pay-and-login-with-amazon-core-module": "1.2.5",
+    "amzn/login-with-amazon-module": "1.2.5",
+    "amzn/amazon-pay-module": "1.2.5"
   }
 }

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.2.4",
+  "version": "1.2.5",
   "license": [
     "Apache-2.0"
   ],
@@ -12,7 +12,7 @@
     "magento/module-store": "^100.1.0|^100.2.0",
     "magento/module-developer": "^100.1.0|^100.2.0",
     "magento/module-quote": "^100.1.0|^101.0.0",
-    "amzn/amazon-pay-sdk-php": "^3.1.0"
+    "amzn/amazon-pay-sdk-php": "^3.2.0"
   },
   "autoload": {
     "files": ["registration.php"],

src/Core/etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Amazon_Core" setup_version="1.2.4">
+    <module name="Amazon_Core" setup_version="1.2.5">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Customer"/>

src/Login/composer.json

@@ -2,12 +2,12 @@
   "name": "amzn/login-with-amazon-module",
   "description": "Login with Amazon module",
   "type": "magento2-module",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "license": [
     "Apache-2.0"
   ],
   "require": {
-    "amzn/amazon-pay-and-login-with-amazon-core-module": "^1.2.3",
+    "amzn/amazon-pay-and-login-with-amazon-core-module": "^1.2.5",
     "magento/module-customer": "^100.1.0|^101.0.0",
 	"magento/module-checkout": "^100.1.0|^100.2.0"
 

src/Payment/composer.json

@@ -2,13 +2,13 @@
   "name": "amzn/amazon-pay-module",
   "description": "Amazon Pay module",
   "type": "magento2-module",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "license": [
     "Apache-2.0"
   ],
   "require": {
-    "amzn/amazon-pay-and-login-with-amazon-core-module": "^1.2.3",
-    "amzn/login-with-amazon-module": "^1.2.3",
+    "amzn/amazon-pay-and-login-with-amazon-core-module": "^1.2.5",
+    "amzn/login-with-amazon-module": "^1.2.5",
     "magento/module-eav": "^100.1.0|^101.0.0",
     "magento/module-sales": "^100.1.0|^101.0.0",
     "magento/module-quote": "^100.1.0|^101.0.0",