Merge branch 'solc-0.7' into release-v3.2.0-solc-0.7

contracts/token/ERC777/ERC777.sol

@@ -113,7 +113,7 @@ contract ERC777 is Context, IERC777, IERC20 {
      *
      * This implementation always returns `1`.
      */
-    function granularity() public view override returns (uint256) {
+    function granularity() public pure override returns (uint256) {
         return 1;
     }