Merge pull request #1190 from algolia/develop

Bring updates from develop for release v3.3.1

Author: rakesh-algolia

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGE LOG
 
+## 3.3.1
+
+### UPDATES
+- Updated to support Guzzle Http version with 6.3 and 7.4 for compatibility with Magento 2.4.x  (#1187)
+
 ## 3.3.0
 
 ### UPDATES

README.md

@@ -1,8 +1,11 @@
 Algolia Search for Magento 2
 ==================
 
-![Latest version](https://img.shields.io/badge/latest-3.3.0-green.svg)
-![Magento 2](https://img.shields.io/badge/Magento-%32.3,%202.4-blue.svg)
+![Latest version](https://img.shields.io/badge/latest-3.3.1-green
+)
+![Magento 2](https://img.shields.io/badge/Magento-2.4.x-orange)
+
+![PHP](https://img.shields.io/badge/PHP-7.3,7.4-blue)
 
 [![CircleCI](https://circleci.com/gh/algolia/algoliasearch-magento-2/tree/master.svg?style=svg)](https://circleci.com/gh/algolia/algoliasearch-magento-2/tree/master)
 

composer.json

@@ -3,18 +3,18 @@
   "description": "Algolia Search integration for Magento 2",
   "type": "magento2-module",
   "license": ["MIT"],
-  "version": "3.3.0",
+  "version": "3.3.1",
   "require": {
     "magento/framework": "~102.0|~103.0",
     "algolia/algoliasearch-client-php": "^2.4",
-    "guzzlehttp/guzzle": "^7.3.0",
+    "guzzlehttp/guzzle": "^6.3.3|^7.3.0",
     "ext-json": "*",
     "ext-PDO": "*",
     "ext-mbstring": "*",
     "ext-dom": "*"
   },
   "suggest": {
-      "algolia/algoliasearch-inventory-magento-2": "Algolia Search Inventory module for Magento 2.3.x and Algolia Search 1.12+ extension"
+      "algolia/algoliasearch-inventory-magento-2": "Algolia Search Inventory module for Magento 2.3.x,2.4.x and Algolia Search 1.12+ extension"
   },
   "repositories": [
     {

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="Algolia_AlgoliaSearch" setup_version="3.3.0">
+    <module name="Algolia_AlgoliaSearch" setup_version="3.3.1">
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Backend"/>