From c08d1439dd55be3c40c8d1c11312dc4e13d11d3d Mon Sep 17 00:00:00 2001
From: Francisco Giordano <frangio.1@gmail.com>
Date: Thu, 10 Sep 2020 20:37:32 -0300
Subject: [PATCH] Bump solhint to 3.2.0

(cherry picked from commit 09d437c1f9f68c4c242db8e489cf3ab882b7a1f3)
---
 contracts/proxy/Initializable.sol |  1 +
 package-lock.json                 | 28 ++++++++++++++--------------
 package.json                      |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/contracts/proxy/Initializable.sol b/contracts/proxy/Initializable.sol
index 0f6d7d431..514fbbb19 100644
--- a/contracts/proxy/Initializable.sol
+++ b/contracts/proxy/Initializable.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 
+// solhint-disable-next-line compiler-version
 pragma solidity >=0.4.24 <0.8.0;
 
 
diff --git a/package-lock.json b/package-lock.json
index 6da0fb621..db5589c07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "openzeppelin-solidity",
-  "version": "3.2.0",
+  "version": "3.2.0-solc-0.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -33928,12 +33928,12 @@
       }
     },
     "solhint": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/solhint/-/solhint-3.0.0.tgz",
-      "integrity": "sha512-z6JBNrtWZ51g/tkuZGc0ywQVskRqIGjXppR4g30bjPgOrxSBWJp3qX2pcI9+FbSI3uu1RqqbZ89CeURkZUF+RA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/solhint/-/solhint-3.2.0.tgz",
+      "integrity": "sha512-BGp7JnnoLzknGC/arcH33oN/LjOz0hKgdauOcBOO5jNjhjnPQ3cAacSMH64fWYShAg5+HYQaSRubInpSKSvzLg==",
       "dev": true,
       "requires": {
-        "@solidity-parser/parser": "^0.6.0",
+        "@solidity-parser/parser": "^0.7.0",
         "ajv": "^6.6.1",
         "antlr4": "4.7.1",
         "ast-parents": "0.0.1",
@@ -33951,9 +33951,9 @@
       },
       "dependencies": {
         "@solidity-parser/parser": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.6.0.tgz",
-          "integrity": "sha512-RiJXfS22frulogcfQCFhbKrd5ATu6P4tYUv/daChiIh6VHyKQ1kkVZVfX6aP7c2YGU/Bf9RwGNKdwLjfpaoqYQ==",
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.7.1.tgz",
+          "integrity": "sha512-5ma2uuwPAEX1TPl2rAPAAuGlBkKnn2oUKQvnhTFlDIB8U/KDWX77FpHtL6Rcz+OwqSCWx9IClxACgyIEJ/GhIw==",
           "dev": true
         },
         "acorn": {
@@ -33963,9 +33963,9 @@
           "dev": true
         },
         "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "version": "6.12.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -34069,9 +34069,9 @@
           }
         },
         "fast-deep-equal": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
         "glob": {
diff --git a/package.json b/package.json
index 58b1bee99..020bb4bad 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "micromatch": "^4.0.2",
     "mocha": "^8.0.1",
     "rimraf": "^3.0.2",
-    "solhint": "^3.0.0",
+    "solhint": "^3.2.0",
     "solidity-coverage": "github:rotcivegaf/solidity-coverage#5875f5b7bc74d447f3312c9c0e9fc7814b482477",
     "solidity-docgen": "^0.5.3"
   },