[17] Merge api-proto with develop #71

magento · Jun 15, 2020 · f59b398 · f59b398
1 parent cd6ffe0
commit f59b398
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/app/code/Magento/CatalogExport/composer.json b/app/code/Magento/CatalogExport/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~7.1.3||~7.2.0||~7.3.0",
+ "php": "~7.3.0||~7.4.0",
  "magento/framework": "*",
  "magento/framework-message-queue": "*",
  "magento/module-catalog-export-api": "*",

diff --git a/app/code/Magento/CatalogExportApi/composer.json b/app/code/Magento/CatalogExportApi/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~7.1.3||~7.2.0||~7.3.0",
+ "php": "~7.3.0||~7.4.0",
  "magento/framework": "*"
  },
  "type": "magento2-module",

diff --git a/app/code/Magento/CatalogMessageBroker/composer.json b/app/code/Magento/CatalogMessageBroker/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~7.1.3||~7.2.0||~7.3.0",
+ "php": "~7.3.0||~7.4.0",
  "magento/framework": "*",
  "magento/module-catalog-export-api": "*",
  "magento/module-catalog-storefront": "*",

diff --git a/composer.json b/composer.json
@@ -316,7 +316,10 @@
  "magento/module-catalog-storefront-api": "*",
  "magento/module-catalog-storefront-graph-ql": "*",
  "magento/module-catalog-storefront-connector": "*",
- "magento/module-storefront-graph-ql": "*"
+ "magento/module-storefront-graph-ql": "*",
+ "magento/module-catalog-export" : "*",
+ "magento/module-catalog-export-api" : "*",
+ "magento/module-catalog-message-broker": "*"
  },
  "conflict": {
  "gene/bluefoot": "*"