diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 363b700a1e..0a0f480a96 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -2,6 +2,7 @@ object Config {
     const val minSdk = 15
     const val compileSdk = 34
     const val targetSdk = 34
+    const val buildToolsVersion = "35.0.0"
 }
 
 object Versions {
diff --git a/facebook-applinks/build.gradle.kts b/facebook-applinks/build.gradle.kts
index a5d4fbf4c3..60007572ab 100644
--- a/facebook-applinks/build.gradle.kts
+++ b/facebook-applinks/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.applinks"
     compileSdk = Config.compileSdk
 
@@ -44,7 +44,10 @@ android {
         consumerProguardFiles("proguard-rules.pro")
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     buildTypes {
         getByName("release") {
diff --git a/facebook-bolts/build.gradle.kts b/facebook-bolts/build.gradle.kts
index 4b85a18295..44500c0e9b 100644
--- a/facebook-bolts/build.gradle.kts
+++ b/facebook-bolts/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.bolts"
     compileSdk = Config.compileSdk
 
@@ -63,11 +63,11 @@ android {
 
     buildTypes {
         getByName("debug") {
-            isTestCoverageEnabled = true
+            enableUnitTestCoverage = true
         }
     }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
@@ -81,7 +81,10 @@ android {
         }
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     if (System.getenv("SANDCASTLE") == "1") {
         testOptions {
diff --git a/facebook-common/build.gradle.kts b/facebook-common/build.gradle.kts
index ef868a17a0..16533787f4 100644
--- a/facebook-common/build.gradle.kts
+++ b/facebook-common/build.gradle.kts
@@ -60,7 +60,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.common"
     compileSdk = Config.compileSdk
 
@@ -73,9 +73,9 @@ android {
         multiDexEnabled = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
@@ -89,10 +89,13 @@ android {
         unitTests.isIncludeAndroidResources = true
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     buildTypes {
-        getByName("debug") { isTestCoverageEnabled = true }
+        getByName("debug") { enableUnitTestCoverage = true }
         getByName("release") {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
diff --git a/facebook-core/build.gradle.kts b/facebook-core/build.gradle.kts
index 364fd27689..fa85c73573 100644
--- a/facebook-core/build.gradle.kts
+++ b/facebook-core/build.gradle.kts
@@ -59,7 +59,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.core"
     compileSdk = Config.compileSdk
 
@@ -73,11 +73,11 @@ android {
 
     buildTypes {
         getByName("debug") {
-            isTestCoverageEnabled = true
+            enableUnitTestCoverage = true
         }
     }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
@@ -106,7 +106,10 @@ android {
             }
         }
     }
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     if (System.getenv("SANDCASTLE") == "1") {
         testOptions {
diff --git a/facebook-gamingservices/build.gradle.kts b/facebook-gamingservices/build.gradle.kts
index 7d9e8357d8..b781d33bb8 100644
--- a/facebook-gamingservices/build.gradle.kts
+++ b/facebook-gamingservices/build.gradle.kts
@@ -55,7 +55,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.gamingservices"
     compileSdk = Config.compileSdk
 
@@ -67,9 +67,9 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
@@ -77,7 +77,7 @@ android {
     }
 
     buildTypes {
-        getByName("debug") { isTestCoverageEnabled = true }
+        getByName("debug") { enableUnitTestCoverage = true }
         getByName("release") {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
@@ -98,7 +98,10 @@ android {
         }
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     if (System.getenv("SANDCASTLE") == "1") {
         testOptions {
diff --git a/facebook-login/build.gradle.kts b/facebook-login/build.gradle.kts
index 11beea7ace..773369155c 100644
--- a/facebook-login/build.gradle.kts
+++ b/facebook-login/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.login"
     compileSdk = Config.compileSdk
 
@@ -47,16 +47,19 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
         targetCompatibility(JavaVersion.VERSION_1_8)
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     buildTypes {
         getByName("release") {
diff --git a/facebook-messenger/build.gradle.kts b/facebook-messenger/build.gradle.kts
index 5736437b4c..166502b00c 100644
--- a/facebook-messenger/build.gradle.kts
+++ b/facebook-messenger/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.messenger"
     compileSdk = Config.compileSdk
 
@@ -42,16 +42,19 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
         targetCompatibility(JavaVersion.VERSION_1_8)
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     buildTypes {
         getByName("release") {
diff --git a/facebook-share/build.gradle.kts b/facebook-share/build.gradle.kts
index 89f2c66099..87490f96bc 100644
--- a/facebook-share/build.gradle.kts
+++ b/facebook-share/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.share"
     compileSdk = Config.compileSdk
 
@@ -44,16 +44,19 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
         targetCompatibility(JavaVersion.VERSION_1_8)
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     buildTypes {
         getByName("release") {
diff --git a/facebook-testutil/build.gradle.kts b/facebook-testutil/build.gradle.kts
index d2f8253e6a..73fbde0686 100644
--- a/facebook-testutil/build.gradle.kts
+++ b/facebook-testutil/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook"
     compileSdk = Config.compileSdk
 
@@ -61,11 +61,14 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
diff --git a/facebook/build.gradle.kts b/facebook/build.gradle.kts
index 68097a1520..3218d98a05 100644
--- a/facebook/build.gradle.kts
+++ b/facebook/build.gradle.kts
@@ -62,7 +62,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook"
     compileSdk = Config.compileSdk
 
@@ -74,9 +74,9 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    aaptOptions { additionalParameters("--no-version-vectors") }
+    androidResources { additionalParameters("--no-version-vectors") }
 
-    lintOptions { isAbortOnError = false }
+    lint { abortOnError = false }
 
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
@@ -90,7 +90,10 @@ android {
         }
     }
 
-    sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
+    sourceSets {
+        getByName("test")
+        { java.srcDir("src/test/kotlin") }
+    }
 
     if (System.getenv("SANDCASTLE") == "1") {
         testOptions {
diff --git a/samples/FBLoginSample/build.gradle b/samples/FBLoginSample/build.gradle
index 1c2007c4bd..6f809e1604 100644
--- a/samples/FBLoginSample/build.gradle
+++ b/samples/FBLoginSample/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.facebook.fbloginsample"
     compileSdkVersion(31)
     defaultConfig {
diff --git a/samples/HelloFacebookSample/build.gradle b/samples/HelloFacebookSample/build.gradle
index a3aaae36c6..966f83bb38 100644
--- a/samples/HelloFacebookSample/build.gradle
+++ b/samples/HelloFacebookSample/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = Config.buildToolsVersion
     namespace = "com.example.hellofacebook"
     compileSdkVersion(31)