diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 89ae76c63..fc2c58cea 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,7 +39,8 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
@@ -49,13 +50,13 @@ android {
         )
 
         // Module-specific
-        disable("ResourceName", "MissingTranslation", "DuplicateStrings")
+        disable += mutableSetOf("ResourceName", "MissingTranslation", "DuplicateStrings")
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     compileOptions {
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 74c43eb7a..2a0ed1518 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -32,7 +32,7 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
@@ -40,7 +40,7 @@ android {
         )
 
         // Module specific
-        disable(
+        disable += mutableSetOf(
             "UnusedQuantity",
             "UnknownNullness",  // TODO fix in future PR
             "TypographyQuotes", // Straight versus directional quotes
@@ -50,11 +50,11 @@ android {
             "VectorPath"
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     testOptions {
diff --git a/build.gradle.kts b/build.gradle.kts
index c5a7dd2a6..5daa66179 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         mavenLocal()
     }
 
@@ -25,7 +24,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         mavenLocal()
     }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9986ac4e6..d317042e8 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,6 +1,5 @@
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 plugins {
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 786448a4c..3e8cb25b6 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -2,7 +2,7 @@ object Config {
     const val version = "8.0.2-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
-    private const val kotlinVersion = "1.3.72"
+    private const val kotlinVersion = "1.7.10"
 
     object SdkVersions {
         const val compile = 29
@@ -11,7 +11,7 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:7.0.0"
+        const val android = "com.android.tools.build:gradle:7.2.2"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.3.8"
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 70ed16072..c8ad1b90b 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -21,18 +21,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index bc7e9aac8..c0dd82713 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -23,18 +23,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
index e5ad2fb51..7db6b9eda 100644
--- a/firestore/build.gradle.kts
+++ b/firestore/build.gradle.kts
@@ -19,18 +19,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {
diff --git a/gradle.properties b/gradle.properties
index bfe632478..4874fd05d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,12 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=false
 
 GROUP=com.firebaseui
 VERSION_NAME=8.0.2-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf51..2e6e5897b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/internal/lintchecks/build.gradle.kts b/internal/lintchecks/build.gradle.kts
index 26d2d5088..b4ef7904e 100644
--- a/internal/lintchecks/build.gradle.kts
+++ b/internal/lintchecks/build.gradle.kts
@@ -22,18 +22,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 }
 
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index c975320fb..f82e9b0b5 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -21,18 +21,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = false // Override
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = false // Override
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 }
 
diff --git a/proguard-tests/build.gradle.kts b/proguard-tests/build.gradle.kts
index c64414f4c..1eeae30ca 100644
--- a/proguard-tests/build.gradle.kts
+++ b/proguard-tests/build.gradle.kts
@@ -6,11 +6,11 @@ plugins {
 val inCiBuild = System.getenv("CI") == "true"
 
 android {
-    compileSdkVersion(Config.SdkVersions.compile)
+    compileSdk = Config.SdkVersions.compile
 
     defaultConfig {
-        minSdkVersion(Config.SdkVersions.min)
-        targetSdkVersion(Config.SdkVersions.target)
+        minSdk = Config.SdkVersions.min
+        targetSdk = Config.SdkVersions.target
 
         versionName = Config.version
         versionCode = 1
@@ -45,9 +45,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
+    lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
@@ -55,11 +55,11 @@ android {
             "MediaCapabilities"
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     variantFilter {
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
index 9b7159ea0..ae252609f 100644
--- a/storage/build.gradle.kts
+++ b/storage/build.gradle.kts
@@ -21,18 +21,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {