Skip to content

Commit

Permalink
Merge pull request #151 from amzn/pre_1.2.0
Browse files Browse the repository at this point in the history
Extension version 1.2.0
  • Loading branch information
danielneu authored Oct 19, 2017
2 parents 3344c18 + 6c44974 commit a8f9c75
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.5",
"version": "1.2.0",
"license": [
"Apache-2.0"
],
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.4`
* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^1.2.0`
* 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.1.4` will always instal 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.0` will always instal 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

Expand Down
9 changes: 4 additions & 5 deletions marketplace-composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
"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.5",
"version": "1.2.0",
"license": [
"Apache-2.0"
],
"require": {
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"amzn/amazon-pay-sdk-php": "^3.1.0",
"amzn/amazon-pay-and-login-with-amazon-core-module": "^1.1.1",
"amzn/login-with-amazon-module": "^1.1.1",
"amzn/amazon-pay-module": "^1.1.1"
"amzn/amazon-pay-and-login-with-amazon-core-module": "1.2.0",
"amzn/login-with-amazon-module": "1.2.0",
"amzn/amazon-pay-module": "1.2.0"
}
}
2 changes: 1 addition & 1 deletion src/Core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.5",
"version": "1.2.0",
"license": [
"Apache-2.0"
],
Expand Down
2 changes: 1 addition & 1 deletion src/Core/etc/module.xml
Original file line number Diff line number Diff line change
@@ -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.1.5">
<module name="Amazon_Core" setup_version="1.2.0">
<sequence>
<module name="Magento_Config" />
<module name="Magento_Store" />
Expand Down
2 changes: 1 addition & 1 deletion src/Login/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "amzn/login-with-amazon-module",
"description": "Login with Amazon module",
"type": "magento2-module",
"version": "1.1.5",
"version": "1.2.0",
"license": [
"Apache-2.0"
],
Expand Down
2 changes: 1 addition & 1 deletion src/Payment/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "amzn/amazon-pay-module",
"description": "Amazon Pay module",
"type": "magento2-module",
"version": "1.1.5",
"version": "1.2.0",
"license": [
"Apache-2.0"
],
Expand Down

0 comments on commit a8f9c75

Please sign in to comment.