Add support for Magento 2.2

Author: srenon

composer.json

@@ -15,7 +15,7 @@
         "magento/framework": "100.0.*|100.1.*|100.2.*"
     },
     "type": "magento2-module",
-    "version": "1.4.6",
+    "version": "1.5.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

etc/adminhtml/system.xml

@@ -82,6 +82,9 @@
                     <label>Set From</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Use Return-Path email address for the From address rather than the Magento supplied value.</comment>
+                    <depends>
+                        <field id="*/*/active">1</field>
+                    </depends>
                 </field>
                 <field id="set_return_path" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Set Return-Path</label>

etc/di.xml

@@ -6,9 +6,15 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+	<!-- For Magento < 2.2 -->
 	<preference for="\Magento\Framework\Mail\Transport" type="MagePal\GmailSmtpApp\Model\Transport"/>
 	<type name="MagePal\GmailSmtpApp\Model\Transport">
 		<plugin sortOrder="100" name="magePalGmailSmtpAppTransport" type="MagePal\GmailSmtpApp\Plugin\Mail\TransportPlugin"/>
 	</type>
+
+	<!-- For Magento Eq 2.2 -->
+	<type name="\Magento\Framework\Mail\TransportInterface">
+		<plugin sortOrder="100" name="magePalGmailSmtpAppTransportInterface" type="MagePal\GmailSmtpApp\Plugin\Mail\TransportPlugin"/>
+	</type>
 </config>
 

etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MagePal_GmailSmtpApp" setup_version="1.4.6">
+    <module name="MagePal_GmailSmtpApp" setup_version="1.5.0">
         <sequence>
             <module name="Magento_Email"/>
         </sequence>