Merge branch 'master' into dd/agp-7.1.0-beta04

Author: ghale

build.gradle

@@ -17,10 +17,10 @@ def isCI = (System.getenv('CI') ?: 'false').toBoolean()
 
 // Maps supported Android plugin versions to the versions of Gradle that support it
 def supportedVersions = [
-    "7.2.0-alpha06": ["7.3.2"],
-    "7.1.0-beta04": ["7.3.2"],
-    "7.0.4": ["7.3.2"],
-    "4.2.2": ["6.9.1", "7.3.2"],
+    "7.2.0-alpha06": ["7.3.3"],
+    "7.1.0-beta04": ["7.3.3"],
+    "7.0.4": ["7.3.3"],
+    "4.2.2": ["6.9.1", "7.3.3"],
     "4.1.3": ["6.5.1", "6.9.1"],
     "4.0.2": ["6.1.1", "6.9.1"],
     "3.6.4": ["5.6.4", "6.9.1"],

gradle/buildScanInit.gradle

@@ -3,7 +3,7 @@ import com.gradle.scan.plugin.BuildScanPlugin
 import org.gradle.util.GradleVersion
 
 initscript {
-    def pluginVersion = "3.7.1"
+    def pluginVersion = "3.8"
 
     repositories {
         gradlePluginPortal()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists