Migrate to using = for property setting

Gradle has deprecated `compileSdk 35` style syntax in
Gradle 8.12, in preparation for that upgrade, fix up the violations
in androidx build.gradle files

Test: ./gradlew bOS --dry-run -> https://ge.androidx.dev/s/bqs4fmehxdqzs/deprecations
      and after -> https://ge.androidx.dev/s/nvc7s5bdfpuaa/deprecations
Change-Id: Ic4787d46f40e3856e5f0fa1e3c0a63e3dddc2108
diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle
index 6ed8271..00222883 100644
--- a/activity/activity-compose/build.gradle
+++ b/activity/activity-compose/build.gradle
@@ -79,6 +79,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.activity.compose"
+    compileSdk = 35
+    namespace = "androidx.activity.compose"
 }
diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle
index 361a6fa..d178013 100644
--- a/activity/activity-compose/samples/build.gradle
+++ b/activity/activity-compose/samples/build.gradle
@@ -61,6 +61,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.activity.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.activity.compose.samples"
 }
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index 2c7e7ac..74ca081 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -49,6 +49,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.activity.ktx"
+    compileSdk = 35
+    namespace = "androidx.activity.ktx"
 }
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index 5a6bd06..5890206 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -15,8 +15,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.activity"
+    compileSdk = 35
+    namespace = "androidx.activity"
 }
 
 dependencies {
diff --git a/activity/integration-tests/baselineprofile/build.gradle b/activity/integration-tests/baselineprofile/build.gradle
index dd1f0be..7f99514 100644
--- a/activity/integration-tests/baselineprofile/build.gradle
+++ b/activity/integration-tests/baselineprofile/build.gradle
@@ -32,7 +32,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     testOptions.managedDevices.allDevices {
@@ -43,7 +43,7 @@
         }
     }
     targetProjectPath = ":activity:integration-tests:testapp"
-    namespace "androidx.activity.integration.testapp.baselineprofile"
+    namespace = "androidx.activity.integration.testapp.baselineprofile"
 }
 
 dependencies {
diff --git a/activity/integration-tests/macrobenchmark-target/build.gradle b/activity/integration-tests/macrobenchmark-target/build.gradle
index e984599..95bcb77 100644
--- a/activity/integration-tests/macrobenchmark-target/build.gradle
+++ b/activity/integration-tests/macrobenchmark-target/build.gradle
@@ -12,8 +12,8 @@
 }
 
 android {
-   compileSdk 35
-   namespace "androidx.activity.integration.macrobenchmark.target"
+   compileSdk = 35
+   namespace = "androidx.activity.integration.macrobenchmark.target"
 }
 
 dependencies {
diff --git a/activity/integration-tests/macrobenchmark/build.gradle b/activity/integration-tests/macrobenchmark/build.gradle
index f60cc3f..f786550 100644
--- a/activity/integration-tests/macrobenchmark/build.gradle
+++ b/activity/integration-tests/macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.activity.integration.macrobenchmark"
+    namespace = "androidx.activity.integration.macrobenchmark"
     targetProjectPath = ":activity:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index 36913af..2b4075c 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle
@@ -22,11 +22,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.activity.integration.testapp"
+        applicationId = "androidx.activity.integration.testapp"
     }
-    namespace "androidx.activity.integration.testapp"
+    namespace = "androidx.activity.integration.testapp"
 }
 
 dependencies {
diff --git a/annotation/annotation-experimental-lint/integration-tests/build.gradle b/annotation/annotation-experimental-lint/integration-tests/build.gradle
index b626e67..74f33f2 100644
--- a/annotation/annotation-experimental-lint/integration-tests/build.gradle
+++ b/annotation/annotation-experimental-lint/integration-tests/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    namespace "androidx.annotation.experimental.lint.integrationtests"
+    namespace = "androidx.annotation.experimental.lint.integrationtests"
 }
 
 dependencies {
diff --git a/annotation/annotation-experimental/build.gradle b/annotation/annotation-experimental/build.gradle
index 0cf51e2..a255272 100644
--- a/annotation/annotation-experimental/build.gradle
+++ b/annotation/annotation-experimental/build.gradle
@@ -46,5 +46,5 @@
 }
 
 android {
-    namespace "androidx.annotation.experimental"
+    namespace = "androidx.annotation.experimental"
 }
diff --git a/appcompat/appcompat-benchmark/build.gradle b/appcompat/appcompat-benchmark/build.gradle
index 8eb2d87..601c7ad 100644
--- a/appcompat/appcompat-benchmark/build.gradle
+++ b/appcompat/appcompat-benchmark/build.gradle
@@ -32,5 +32,5 @@
 }
 
 android {
-    namespace "androidx.appcompat.benchmark"
+    namespace = "androidx.appcompat.benchmark"
 }
diff --git a/appcompat/appcompat-lint/integration-tests/build.gradle b/appcompat/appcompat-lint/integration-tests/build.gradle
index 309699d..701ab07 100644
--- a/appcompat/appcompat-lint/integration-tests/build.gradle
+++ b/appcompat/appcompat-lint/integration-tests/build.gradle
@@ -19,14 +19,12 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
     }
     lintOptions {
         disable "WrongThread"
-        // TODO: Enable lint after appcompat:1.1.0 release or use lint-baseline.xml instead.
-        abortOnError false
     }
-    namespace "com.example.android.appcompat"
+    namespace = "com.example.android.appcompat"
 }
diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle
index b5e53c11..012774e 100644
--- a/appcompat/appcompat-resources/build.gradle
+++ b/appcompat/appcompat-resources/build.gradle
@@ -61,7 +61,7 @@
         additionalParameters "--no-version-vectors"
         noCompress "ttf"
     }
-    namespace "androidx.appcompat.resources"
+    namespace = "androidx.appcompat.resources"
 }
 
 androidx {
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle
index 8fa8635..27328bd 100644
--- a/appcompat/appcompat/build.gradle
+++ b/appcompat/appcompat/build.gradle
@@ -104,8 +104,8 @@
     useLibrary "android.test.runner"
     useLibrary "android.test.base"
     useLibrary "android.test.mock"
-    namespace "androidx.appcompat"
-    testNamespace "androidx.appcompat.test"
+    namespace = "androidx.appcompat"
+    testNamespace = "androidx.appcompat.test"
 }
 
 androidx {
diff --git a/appcompat/integration-tests/receive-content-testapp/build.gradle b/appcompat/integration-tests/receive-content-testapp/build.gradle
index 342bb9f..a610d9d 100644
--- a/appcompat/integration-tests/receive-content-testapp/build.gradle
+++ b/appcompat/integration-tests/receive-content-testapp/build.gradle
@@ -20,8 +20,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.appcompat.demo.receivecontent"
+    compileSdk = 35
+    namespace = "androidx.appcompat.demo.receivecontent"
 }
 
 dependencies {
diff --git a/appsearch/appsearch-builtin-types/build.gradle b/appsearch/appsearch-builtin-types/build.gradle
index dbce0e2..8d0291a 100644
--- a/appsearch/appsearch-builtin-types/build.gradle
+++ b/appsearch/appsearch-builtin-types/build.gradle
@@ -56,6 +56,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.appsearch.builtintypes"
+    compileSdk = 35
+    namespace = "androidx.appsearch.builtintypes"
 }
diff --git a/appsearch/appsearch-debug-view/build.gradle b/appsearch/appsearch-debug-view/build.gradle
index e3fd5be..c14fd19 100644
--- a/appsearch/appsearch-debug-view/build.gradle
+++ b/appsearch/appsearch-debug-view/build.gradle
@@ -29,8 +29,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.appsearch.debugview"
+    compileSdk = 35
+    namespace = "androidx.appsearch.debugview"
 }
 
 dependencies {
diff --git a/appsearch/appsearch-debug-view/samples/build.gradle b/appsearch/appsearch-debug-view/samples/build.gradle
index 3321369..3412838 100644
--- a/appsearch/appsearch-debug-view/samples/build.gradle
+++ b/appsearch/appsearch-debug-view/samples/build.gradle
@@ -29,8 +29,8 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "androidx.appsearch.debugview.samples"
+    compileSdk = 35
+    namespace = "androidx.appsearch.debugview.samples"
 }
 
 dependencies {
diff --git a/appsearch/appsearch-ktx/build.gradle b/appsearch/appsearch-ktx/build.gradle
index 5be9af0..5dedd3e 100644
--- a/appsearch/appsearch-ktx/build.gradle
+++ b/appsearch/appsearch-ktx/build.gradle
@@ -50,6 +50,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.appsearch.ktx"
+    compileSdk = 35
+    namespace = "androidx.appsearch.ktx"
 }
diff --git a/appsearch/appsearch-local-storage/build.gradle b/appsearch/appsearch-local-storage/build.gradle
index 818a63c..b1bdf1b 100644
--- a/appsearch/appsearch-local-storage/build.gradle
+++ b/appsearch/appsearch-local-storage/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -40,7 +40,7 @@
         //   desugared twice in some workflows, which fails. Decide how to handle this (e.g.
         //   splitting targets, continuing with the consumerProguardFiles solution here, fixing the
         //   flows that perform duplicate desugaring, or something else).
-        minifyEnabled false
+        minifyEnabled = false
         consumerProguardFiles "proguard-rules.pro"
     }
     // TODO(b/161205849): We've had to move libicing.so compilation into appsearch:appsearch to get
@@ -59,11 +59,11 @@
     }
     externalNativeBuild {
         cmake {
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
             path "../../../../external/icing/CMakeLists.txt"
         }
     }
-    namespace "androidx.appsearch.localstorage"
+    namespace = "androidx.appsearch.localstorage"
 }
 
 // Bundles dependency in bundleInside() inside of the libs/ directory of the aar.
diff --git a/appsearch/appsearch-platform-storage/build.gradle b/appsearch/appsearch-platform-storage/build.gradle
index 8920fdbf..48ef962 100644
--- a/appsearch/appsearch-platform-storage/build.gradle
+++ b/appsearch/appsearch-platform-storage/build.gradle
@@ -52,5 +52,5 @@
 
 android {
     compileSdk = 35
-    namespace "androidx.appsearch.platformstorage"
+    namespace = "androidx.appsearch.platformstorage"
 }
diff --git a/appsearch/appsearch-play-services-storage/build.gradle b/appsearch/appsearch-play-services-storage/build.gradle
index 604c6d6..0a2702e 100644
--- a/appsearch/appsearch-play-services-storage/build.gradle
+++ b/appsearch/appsearch-play-services-storage/build.gradle
@@ -54,8 +54,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.appsearch.playservicesstorage"
+    compileSdk = 35
+    namespace = "androidx.appsearch.playservicesstorage"
      defaultConfig {
     }
 }
diff --git a/appsearch/appsearch-test-util/build.gradle b/appsearch/appsearch-test-util/build.gradle
index 44410090..91c2404 100644
--- a/appsearch/appsearch-test-util/build.gradle
+++ b/appsearch/appsearch-test-util/build.gradle
@@ -42,6 +42,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.appsearch.testutil"
+    compileSdk = 35
+    namespace = "androidx.appsearch.testutil"
 }
diff --git a/appsearch/appsearch/build.gradle b/appsearch/appsearch/build.gradle
index edbbfca..9e020fb 100644
--- a/appsearch/appsearch/build.gradle
+++ b/appsearch/appsearch/build.gradle
@@ -29,11 +29,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.appsearch"
+    namespace = "androidx.appsearch"
 }
 
 dependencies {
diff --git a/arch/core/core-runtime/build.gradle b/arch/core/core-runtime/build.gradle
index 57e9f8d..cf65ffa 100644
--- a/arch/core/core-runtime/build.gradle
+++ b/arch/core/core-runtime/build.gradle
@@ -42,5 +42,5 @@
 }
 
 android {
-    namespace "androidx.arch.core"
+    namespace = "androidx.arch.core"
 }
diff --git a/arch/core/core-testing/build.gradle b/arch/core/core-testing/build.gradle
index 4985914..956c653 100644
--- a/arch/core/core-testing/build.gradle
+++ b/arch/core/core-testing/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.arch.core.testing"
+    namespace = "androidx.arch.core.testing"
 }
diff --git a/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle b/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle
index a5515aa..f2b5959 100644
--- a/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle
+++ b/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle
@@ -29,5 +29,5 @@
 }
 
 android {
-    namespace "androidx.asynclayoutinflater.appcompatfactory"
+    namespace = "androidx.asynclayoutinflater.appcompatfactory"
 }
diff --git a/asynclayoutinflater/asynclayoutinflater/build.gradle b/asynclayoutinflater/asynclayoutinflater/build.gradle
index 5c2b29d..afe5715 100644
--- a/asynclayoutinflater/asynclayoutinflater/build.gradle
+++ b/asynclayoutinflater/asynclayoutinflater/build.gradle
@@ -34,5 +34,5 @@
 }
 
 android {
-    namespace "androidx.asynclayoutinflater"
+    namespace = "androidx.asynclayoutinflater"
 }
diff --git a/autofill/autofill/build.gradle b/autofill/autofill/build.gradle
index df1bf78..2c16292 100644
--- a/autofill/autofill/build.gradle
+++ b/autofill/autofill/build.gradle
@@ -49,5 +49,5 @@
 }
 
 android {
-    namespace "androidx.autofill"
+    namespace = "androidx.autofill"
 }
diff --git a/benchmark/baseline-profile-gradle-plugin/build.gradle b/benchmark/baseline-profile-gradle-plugin/build.gradle
index b6dda8c..d25c929 100644
--- a/benchmark/baseline-profile-gradle-plugin/build.gradle
+++ b/benchmark/baseline-profile-gradle-plugin/build.gradle
@@ -107,7 +107,7 @@
 }
 
 tasks.withType(Test).configureEach { test ->
-    test.maxParallelForks(2)
+    test.maxParallelForks = 2
     test.javaLauncher = javaToolchains.launcherFor {
         // Test on JDK 17 which supports lower versions of AGP. This can be removed
         // once we move to AGP 8.2.1+
diff --git a/benchmark/benchmark-common/build.gradle b/benchmark/benchmark-common/build.gradle
index 0718f57..692d87b1 100644
--- a/benchmark/benchmark-common/build.gradle
+++ b/benchmark/benchmark-common/build.gradle
@@ -46,7 +46,7 @@
                 "androidx/traceprocessor/testdata"
         )
     }
-    namespace "androidx.benchmark"
+    namespace = "androidx.benchmark"
     defaultConfig {
         externalNativeBuild {
             cmake {
@@ -57,7 +57,7 @@
     externalNativeBuild {
         cmake {
             path file('src/main/cpp/CMakeLists.txt')
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
         }
     }
 }
diff --git a/benchmark/benchmark-junit4/build.gradle b/benchmark/benchmark-junit4/build.gradle
index c440d5d..7b8adce 100644
--- a/benchmark/benchmark-junit4/build.gradle
+++ b/benchmark/benchmark-junit4/build.gradle
@@ -39,7 +39,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.benchmark.junit4"
+    namespace = "androidx.benchmark.junit4"
 }
 
 dependencies {
diff --git a/benchmark/benchmark-macro-junit4/build.gradle b/benchmark/benchmark-macro-junit4/build.gradle
index 3ebdfaa..6a59284 100644
--- a/benchmark/benchmark-macro-junit4/build.gradle
+++ b/benchmark/benchmark-macro-junit4/build.gradle
@@ -34,7 +34,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
 
         // The package name is passed to the app as an instrumentation runner argument.
         // Set default target package at runtime. This could also be set by baseline profile
@@ -50,7 +50,7 @@
         testInstrumentationRunnerArguments["androidx.benchmark.output.payload.simpleValue"] =
                 "simple_value"
     }
-    namespace "androidx.benchmark.macro.junit4"
+    namespace = "androidx.benchmark.macro.junit4"
 }
 
 dependencies {
diff --git a/benchmark/benchmark-macro/build.gradle b/benchmark/benchmark-macro/build.gradle
index cb5aa1c..5ec5df2 100644
--- a/benchmark/benchmark-macro/build.gradle
+++ b/benchmark/benchmark-macro/build.gradle
@@ -36,7 +36,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
 
         // We don't care about perf from these correctness tests, so suppress
         // anything that may otherwise block these tests
@@ -64,7 +64,7 @@
         )
     }
 
-    namespace "androidx.benchmark.macro"
+    namespace = "androidx.benchmark.macro"
 }
 
 dependencies {
diff --git a/benchmark/benchmark/build.gradle b/benchmark/benchmark/build.gradle
index 3c10910..d3c0e4e 100644
--- a/benchmark/benchmark/build.gradle
+++ b/benchmark/benchmark/build.gradle
@@ -44,7 +44,7 @@
 }
 
 android {
-    namespace "androidx.benchmark.benchmark"
+    namespace = "androidx.benchmark.benchmark"
     buildTypes.release {
         androidTest {
             enableMinification = false
diff --git a/benchmark/integration-tests/baselineprofile-consumer/build.gradle b/benchmark/integration-tests/baselineprofile-consumer/build.gradle
index 5d6d8d8..15cdcdcc 100644
--- a/benchmark/integration-tests/baselineprofile-consumer/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-consumer/build.gradle
@@ -41,8 +41,8 @@
     }
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
         releaseLibrariesOnly {
@@ -50,7 +50,7 @@
             matchingFallbacks += "release"
         }
     }
-    namespace "androidx.benchmark.integration.baselineprofile.consumer"
+    namespace = "androidx.benchmark.integration.baselineprofile.consumer"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle b/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle
index e2cef97..a6f6b6a 100644
--- a/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle
@@ -24,8 +24,8 @@
 android {
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
@@ -51,7 +51,7 @@
             matchingFallbacks += "red"
         }
     }
-    namespace "androidx.benchmark.integration.baselineprofile.flavors.consumer"
+    namespace = "androidx.benchmark.integration.baselineprofile.flavors.consumer"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle b/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle
index a86b882..30d2b86 100644
--- a/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle
@@ -32,7 +32,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     testOptions.managedDevices.allDevices {
@@ -51,7 +51,7 @@
         // not in this producer to test baseline profile matching fallback.
     }
     targetProjectPath = ":benchmark:integration-tests:baselineprofile-flavors-consumer"
-    namespace "androidx.benchmark.integration.baselineprofile.flavors.producer"
+    namespace = "androidx.benchmark.integration.baselineprofile.flavors.producer"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle b/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle
index 2c8ca82..122b543 100644
--- a/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle
@@ -24,12 +24,12 @@
 android {
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    namespace "androidx.benchmark.integration.baselineprofile.library.apptarget"
+    namespace = "androidx.benchmark.integration.baselineprofile.library.apptarget"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle b/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle
index 4bda740..75471f9 100644
--- a/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle
@@ -22,7 +22,7 @@
 }
 
 android {
-    namespace "androidx.benchmark.integration.baselineprofile.library.consumer"
+    namespace = "androidx.benchmark.integration.baselineprofile.library.consumer"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/baselineprofile-library-producer/build.gradle b/benchmark/integration-tests/baselineprofile-library-producer/build.gradle
index a5432f1..3622c2b 100644
--- a/benchmark/integration-tests/baselineprofile-library-producer/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-library-producer/build.gradle
@@ -32,7 +32,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     testOptions.managedDevices.allDevices {
@@ -43,7 +43,7 @@
         }
     }
     targetProjectPath = ":benchmark:integration-tests:baselineprofile-library-app-target"
-    namespace "androidx.benchmark.integration.baselineprofile.library.producer"
+    namespace = "androidx.benchmark.integration.baselineprofile.library.producer"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/baselineprofile-producer/build.gradle b/benchmark/integration-tests/baselineprofile-producer/build.gradle
index b4132ee..f423abf 100644
--- a/benchmark/integration-tests/baselineprofile-producer/build.gradle
+++ b/benchmark/integration-tests/baselineprofile-producer/build.gradle
@@ -32,7 +32,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     testOptions.managedDevices.allDevices {
@@ -47,7 +47,7 @@
         releaseLibrariesOnly { }
     }
     targetProjectPath = ":benchmark:integration-tests:baselineprofile-consumer"
-    namespace "androidx.benchmark.integration.baselineprofile.producer"
+    namespace = "androidx.benchmark.integration.baselineprofile.producer"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/dry-run-benchmark/build.gradle b/benchmark/integration-tests/dry-run-benchmark/build.gradle
index 3326e14..38997e5 100644
--- a/benchmark/integration-tests/dry-run-benchmark/build.gradle
+++ b/benchmark/integration-tests/dry-run-benchmark/build.gradle
@@ -30,5 +30,5 @@
 }
 
 android {
-    namespace "androidx.benchmark.integration.dryrun.benchmark"
+    namespace = "androidx.benchmark.integration.dryrun.benchmark"
 }
diff --git a/benchmark/integration-tests/macrobenchmark-target/build.gradle b/benchmark/integration-tests/macrobenchmark-target/build.gradle
index 30d9d3f..30f3e2d 100644
--- a/benchmark/integration-tests/macrobenchmark-target/build.gradle
+++ b/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -23,16 +23,16 @@
 android {
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles(
                     getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro"
             )
         }
     }
-    compileSdkVersion 35
-    namespace "androidx.benchmark.integration.macrobenchmark.target"
+    compileSdk = 35
+    namespace = "androidx.benchmark.integration.macrobenchmark.target"
 }
 
 dependencies {
diff --git a/benchmark/integration-tests/macrobenchmark/build.gradle b/benchmark/integration-tests/macrobenchmark/build.gradle
index 15a5944..6fd4c7c 100644
--- a/benchmark/integration-tests/macrobenchmark/build.gradle
+++ b/benchmark/integration-tests/macrobenchmark/build.gradle
@@ -32,7 +32,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
         testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR"
 
     }
@@ -42,7 +42,7 @@
                 "androidx/traceprocessor/testdata"
         )
     }
-    namespace "androidx.benchmark.integration.macrobenchmark"
+    namespace = "androidx.benchmark.integration.macrobenchmark"
     targetProjectPath = ":benchmark:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/benchmark/integration-tests/startup-benchmark/build.gradle b/benchmark/integration-tests/startup-benchmark/build.gradle
index 52e6b41..f008e06 100644
--- a/benchmark/integration-tests/startup-benchmark/build.gradle
+++ b/benchmark/integration-tests/startup-benchmark/build.gradle
@@ -30,5 +30,5 @@
 }
 
 android {
-    namespace "androidx.benchmark.integration.startup.benchmark"
+    namespace = "androidx.benchmark.integration.startup.benchmark"
 }
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
index 3afb4012..15bd8ab 100644
--- a/biometric/biometric/build.gradle
+++ b/biometric/biometric/build.gradle
@@ -75,7 +75,7 @@
         consumerProguardFiles "proguard-rules.pro"
     }
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.biometric"
+    namespace = "androidx.biometric"
     compileSdk = 35
 }
 
diff --git a/biometric/biometric/samples/build.gradle b/biometric/biometric/samples/build.gradle
index c8b30bf..7ae52d3 100644
--- a/biometric/biometric/samples/build.gradle
+++ b/biometric/biometric/samples/build.gradle
@@ -37,6 +37,6 @@
     description = "Contains the sample code for the AndroidX Biometric library"
 }
 android {
-    compileSdk 35
-    namespace "androidx.biometric.samples"
+    compileSdk = 35
+    namespace = "androidx.biometric.samples"
 }
diff --git a/biometric/integration-tests/testapp/build.gradle b/biometric/integration-tests/testapp/build.gradle
index ae40263..259f4f6 100644
--- a/biometric/integration-tests/testapp/build.gradle
+++ b/biometric/integration-tests/testapp/build.gradle
@@ -21,22 +21,22 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.biometric.integration.testapp"
+        applicationId = "androidx.biometric.integration.testapp"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
 
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.biometric.integration.testapp"
+    namespace = "androidx.biometric.integration.testapp"
 }
 
 dependencies {
diff --git a/bluetooth/bluetooth-testing/build.gradle b/bluetooth/bluetooth-testing/build.gradle
index 2cae81b..9199a37 100644
--- a/bluetooth/bluetooth-testing/build.gradle
+++ b/bluetooth/bluetooth-testing/build.gradle
@@ -50,8 +50,8 @@
 }
 
 android {
-    namespace "androidx.bluetooth.testing"
+    namespace = "androidx.bluetooth.testing"
     defaultConfig {
-        minSdkVersion 33
+        minSdk = 33
     }
 }
diff --git a/bluetooth/bluetooth/build.gradle b/bluetooth/bluetooth/build.gradle
index 1065e03..3ba07ba 100644
--- a/bluetooth/bluetooth/build.gradle
+++ b/bluetooth/bluetooth/build.gradle
@@ -53,5 +53,5 @@
 }
 
 android {
-    namespace "androidx.bluetooth"
+    namespace = "androidx.bluetooth"
 }
diff --git a/bluetooth/integration-tests/testapp/build.gradle b/bluetooth/integration-tests/testapp/build.gradle
index 6cd02f0..1344503 100644
--- a/bluetooth/integration-tests/testapp/build.gradle
+++ b/bluetooth/integration-tests/testapp/build.gradle
@@ -33,9 +33,9 @@
 
 android {
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.bluetooth.integration.testapp"
+    namespace = "androidx.bluetooth.integration.testapp"
 }
 
 dependencies {
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle
index 05fa6d1..0dfee49 100644
--- a/browser/browser/build.gradle
+++ b/browser/browser/build.gradle
@@ -19,11 +19,11 @@
     }
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.browser"
+    namespace = "androidx.browser"
 }
 
 dependencies {
diff --git a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
index 0572ea7..92f2564 100644
--- a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
+++ b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
@@ -14,7 +14,7 @@
 }
 
 android {
-    namespace "androidx.buildSrc.tests.lib"
+    namespace = "androidx.buildSrc.tests.lib"
 }
 
 androidx {
diff --git a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle
index e013879..dae43d5 100644
--- a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle
+++ b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle
@@ -17,7 +17,7 @@
 }
 
 android {
-    namespace "androidx.testapp"
+    namespace = "androidx.testapp"
 }
 
 androidx {
diff --git a/buildSrc/repos.gradle b/buildSrc/repos.gradle
index 297a520..d50435b 100644
--- a/buildSrc/repos.gradle
+++ b/buildSrc/repos.gradle
@@ -34,12 +34,12 @@
     if (metalavaRepoOverride != null) {
         for(extraRepo in metalavaRepoOverride.split(File.pathSeparator)) {
             handler.maven {
-                url extraRepo
+                url = extraRepo
             }
         }
     }
     handler.maven {
-        url("${repos.prebuiltsRoot}/androidx/internal")
+        url = "${repos.prebuiltsRoot}/androidx/internal"
         metadataSources {
             mavenPom()
             artifact()
@@ -51,7 +51,7 @@
         }
     }
     handler.maven {
-        url("${repos.prebuiltsRoot}/androidx/external")
+        url = "${repos.prebuiltsRoot}/androidx/external"
         metadataSources {
             mavenPom()
             artifact()
@@ -59,7 +59,7 @@
         if (metalavaRepoOverride != null) {
             // When using custom metalava repo, do not resolve metalava artifacts from this repo
             content {
-                excludeGroup "com.android.tools.metalava"
+                excludeGroup = "com.android.tools.metalava"
             }
         }
     }
@@ -68,7 +68,7 @@
         handler.google()
         handler.gradlePluginPortal()
         handler.maven {
-               url("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+               url = "https://maven.pkg.jetbrains.space/public/p/compose/dev"
         }
         handler.mavenLocal()
     }
@@ -77,7 +77,7 @@
     if (androidPluginRepoOverride != null) {
         for(extraRepo in androidPluginRepoOverride.split(File.pathSeparator)) {
             handler.maven {
-                url extraRepo
+                url = extraRepo
             }
         }
     }
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index d426d2a..bb710ed 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -86,13 +86,13 @@
 
 android {
     lintOptions {
-        enable 'CameraXQuirksClassDetector'
+        enable("CameraXQuirksClassDetector")
     }
-    namespace "androidx.camera.camera2.pipe.integration"
+    namespace = "androidx.camera.camera2.pipe.integration"
 }
 
 tasks.withType(Test).configureEach { test ->
-    test.maxParallelForks(2)
+    test.maxParallelForks = 2
 }
 
 ksp {
diff --git a/camera/camera-camera2-pipe-testing/build.gradle b/camera/camera-camera2-pipe-testing/build.gradle
index 9dfa1cd..0e56777d 100644
--- a/camera/camera-camera2-pipe-testing/build.gradle
+++ b/camera/camera-camera2-pipe-testing/build.gradle
@@ -55,7 +55,7 @@
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.camera2.pipe.testing"
+    namespace = "androidx.camera.camera2.pipe.testing"
 }
 
 // Allow usage of Kotlin's @OptIn.
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle
index 54f2fce..3ebcc25 100644
--- a/camera/camera-camera2-pipe/build.gradle
+++ b/camera/camera-camera2-pipe/build.gradle
@@ -65,7 +65,7 @@
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.camera2.pipe"
+    namespace = "androidx.camera.camera2.pipe"
 }
 
 ksp {
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index fe5ef3d..e5fb174 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -81,20 +81,20 @@
 }
 android {
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
     }
 
     lintOptions {
-        enable 'CameraXQuirksClassDetector'
+        enable("CameraXQuirksClassDetector")
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.camera2"
+    namespace = "androidx.camera.camera2"
 }
 
 tasks.withType(Test).configureEach { test ->
-    test.maxParallelForks(2)
+    test.maxParallelForks = 2
 }
 
 androidx {
diff --git a/camera/camera-compose/build.gradle b/camera/camera-compose/build.gradle
index a7ee5e3..5f7218c 100644
--- a/camera/camera-compose/build.gradle
+++ b/camera/camera-compose/build.gradle
@@ -56,8 +56,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.camera.compose"
+    compileSdk = 35
+    namespace = "androidx.camera.compose"
     // TODO(b/349411310): Remove once we can update runtime to 1.7.0
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/camera/camera-compose/samples/build.gradle b/camera/camera-compose/samples/build.gradle
index a2d5268..144850a 100644
--- a/camera/camera-compose/samples/build.gradle
+++ b/camera/camera-compose/samples/build.gradle
@@ -43,8 +43,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.camera.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.camera.compose.samples"
 }
 
 androidx {
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 4efb36c..12a8374 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -99,20 +99,20 @@
     }
 
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
     }
 
     buildFeatures.prefab = true
 
     externalNativeBuild {
         cmake {
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
             path "src/main/cpp/CMakeLists.txt"
         }
     }
 
     lintOptions {
-        enable 'CameraXQuirksClassDetector'
+        enable("CameraXQuirksClassDetector")
     }
 
     // Use Robolectric 4.+
@@ -121,11 +121,11 @@
     packagingOptions {
         pickFirst "META-INF/support.camera_camera-core.version"
     }
-    namespace "androidx.camera.core"
+    namespace = "androidx.camera.core"
 }
 
 tasks.withType(Test).configureEach { test ->
-    test.maxParallelForks(2)
+    test.maxParallelForks = 2
 }
 
 androidx {
diff --git a/camera/camera-effects-still-portrait/build.gradle b/camera/camera-effects-still-portrait/build.gradle
index 2c057af..9a2fa87 100644
--- a/camera/camera-effects-still-portrait/build.gradle
+++ b/camera/camera-effects-still-portrait/build.gradle
@@ -26,7 +26,7 @@
 }
 android {
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.effects.stillportrait"
+    namespace = "androidx.camera.effects.stillportrait"
 }
 androidx {
     name = "Camera Effects: Still Portrait"
diff --git a/camera/camera-effects/build.gradle b/camera/camera-effects/build.gradle
index 6f6a6b0..68819cf 100644
--- a/camera/camera-effects/build.gradle
+++ b/camera/camera-effects/build.gradle
@@ -49,7 +49,7 @@
 }
 android {
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.effects"
+    namespace = "androidx.camera.effects"
 }
 androidx {
     name = "Camera Effects"
diff --git a/camera/camera-extensions-stub/build.gradle b/camera/camera-extensions-stub/build.gradle
index 0ad02fb..e06b23c 100644
--- a/camera/camera-extensions-stub/build.gradle
+++ b/camera/camera-extensions-stub/build.gradle
@@ -34,7 +34,7 @@
 }
 
  android {
-     namespace "androidx.camera.extensions.impl"
+     namespace = "androidx.camera.extensions.impl"
 
      lintOptions {
          enable 'CameraXQuirksClassDetector'
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index c7e4120..ea583b3 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -85,7 +85,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.extensions"
+    namespace = "androidx.camera.extensions"
 }
 
 androidx {
diff --git a/camera/camera-feature-combination-query-play-services/build.gradle b/camera/camera-feature-combination-query-play-services/build.gradle
index 339be46..f90edbb 100644
--- a/camera/camera-feature-combination-query-play-services/build.gradle
+++ b/camera/camera-feature-combination-query-play-services/build.gradle
@@ -42,14 +42,14 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     lintOptions {
         enable 'CameraXQuirksClassDetector'
     }
 
     testOptions.unitTests.includeAndroidResources = true
 
-    namespace "androidx.camera.featurecombinationquery.playservices"
+    namespace = "androidx.camera.featurecombinationquery.playservices"
 }
 
 androidx {
diff --git a/camera/camera-feature-combination-query/build.gradle b/camera/camera-feature-combination-query/build.gradle
index 525a8c8..f3be51d 100644
--- a/camera/camera-feature-combination-query/build.gradle
+++ b/camera/camera-feature-combination-query/build.gradle
@@ -41,9 +41,9 @@
         enable 'CameraXQuirksClassDetector'
     }
 
-    compileSdk 35
+    compileSdk = 35
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.featurecombinationquery"
+    namespace = "androidx.camera.featurecombinationquery"
 }
 
 androidx {
diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle
index 0d1cda6..5e67a27 100644
--- a/camera/camera-lifecycle/build.gradle
+++ b/camera/camera-lifecycle/build.gradle
@@ -65,7 +65,7 @@
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.lifecycle"
+    namespace = "androidx.camera.lifecycle"
 }
 
 androidx {
diff --git a/camera/camera-lifecycle/samples/build.gradle b/camera/camera-lifecycle/samples/build.gradle
index 5885e79..5f5011f 100644
--- a/camera/camera-lifecycle/samples/build.gradle
+++ b/camera/camera-lifecycle/samples/build.gradle
@@ -39,7 +39,7 @@
 }
 
 android {
-    namespace "androidx.camera.lifecycle.samples"
+    namespace = "androidx.camera.lifecycle.samples"
 }
 
 androidx {
diff --git a/camera/camera-mlkit-vision/build.gradle b/camera/camera-mlkit-vision/build.gradle
index c7fa94a..58f5187 100644
--- a/camera/camera-mlkit-vision/build.gradle
+++ b/camera/camera-mlkit-vision/build.gradle
@@ -49,7 +49,7 @@
     }
 
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.mlkit.vision"
+    namespace = "androidx.camera.mlkit.vision"
 }
 
 androidx {
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index e34fc2e..792deb0 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -97,10 +97,10 @@
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
         }
     }
-    namespace "androidx.camera.testing"
+    namespace = "androidx.camera.testing"
 }
 
 androidx {
diff --git a/camera/camera-testlib-extensions/build.gradle b/camera/camera-testlib-extensions/build.gradle
index 34bc14d..ed37ca6 100644
--- a/camera/camera-testlib-extensions/build.gradle
+++ b/camera/camera-testlib-extensions/build.gradle
@@ -38,7 +38,7 @@
         enable 'CameraXQuirksClassDetector'
     }
 
-    namespace "androidx.camera.extensions.impl"
+    namespace = "androidx.camera.extensions.impl"
 }
 
 androidx {
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle
index f992c47..118735f8 100644
--- a/camera/camera-video/build.gradle
+++ b/camera/camera-video/build.gradle
@@ -80,7 +80,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.video"
+    namespace = "androidx.camera.video"
 }
 
 androidx {
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle
index fe349d6..b7020ea 100644
--- a/camera/camera-view/build.gradle
+++ b/camera/camera-view/build.gradle
@@ -80,7 +80,7 @@
     }
 
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.view"
+    namespace = "androidx.camera.view"
 }
 androidx {
     name = "Camera View"
diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle
index 8a69c35..4b2b807 100644
--- a/camera/integration-tests/avsynctestapp/build.gradle
+++ b/camera/integration-tests/avsynctestapp/build.gradle
@@ -22,18 +22,16 @@
 }
 
 android {
-    namespace 'androidx.camera.integration.avsync'
-
-    compileSdk 35
-
+    namespace = "androidx.camera.integration.avsync"
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.camera.integration.avsync"
+        applicationId = "androidx.camera.integration.avsync"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
 }
diff --git a/camera/integration-tests/camerapipetestapp/build.gradle b/camera/integration-tests/camerapipetestapp/build.gradle
index 817f483..a615ba4 100644
--- a/camera/integration-tests/camerapipetestapp/build.gradle
+++ b/camera/integration-tests/camerapipetestapp/build.gradle
@@ -23,7 +23,7 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.camera.integration.camera2.pipe"
+        applicationId = "androidx.camera.integration.camera2.pipe"
     }
 
     sourceSets {
@@ -36,13 +36,13 @@
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro")
         }
     }
-    namespace "androidx.camera.integration.camera2.pipe"
+    namespace = "androidx.camera.integration.camera2.pipe"
 }
 
 dependencies {
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index 1d35fd6..586bdf0 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -22,7 +22,7 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.camera.integration.core"
+        applicationId = "androidx.camera.integration.core"
 
         externalNativeBuild {
             cmake {
@@ -34,12 +34,12 @@
 
     buildTypes {
         debug {
-            pseudoLocalesEnabled true
+            pseudoLocalesEnabled = true
         }
 
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
         }
     }
@@ -47,10 +47,10 @@
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
         }
     }
-    namespace "androidx.camera.integration.core"
+    namespace = "androidx.camera.integration.core"
 }
 
 dependencies {
diff --git a/camera/integration-tests/diagnosetestapp/build.gradle b/camera/integration-tests/diagnosetestapp/build.gradle
index cceb4a2..c522c5c 100644
--- a/camera/integration-tests/diagnosetestapp/build.gradle
+++ b/camera/integration-tests/diagnosetestapp/build.gradle
@@ -22,18 +22,18 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.camera.integration.diagnose"
+        applicationId = "androidx.camera.integration.diagnose"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
 
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.integration.diagnose"
+    namespace = "androidx.camera.integration.diagnose"
 }
 
 dependencies {
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle
index fa75554..761555a 100644
--- a/camera/integration-tests/extensionstestapp/build.gradle
+++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -32,18 +32,18 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.camera.integration.extensions"
+        applicationId = "androidx.camera.integration.extensions"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    namespace "androidx.camera.integration.extensions"
+    namespace = "androidx.camera.integration.extensions"
 }
 
 dependencies {
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle
index d3e0f94..43c8180 100644
--- a/camera/integration-tests/timingtestapp/build.gradle
+++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -22,7 +22,7 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.camera.integration.antelope"
+        applicationId = "androidx.camera.integration.antelope"
         versionCode 35
         versionName "1.35"
     }
@@ -35,16 +35,16 @@
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
         }
     }
     testOptions {
         animationsDisabled = true
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.camera.integration.antelope"
+    namespace = "androidx.camera.integration.antelope"
 }
 
 dependencies {
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index c244a0e..fc2cc64 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -21,10 +21,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        applicationId "androidx.camera.integration.uiwidgets"
+        applicationId = "androidx.camera.integration.uiwidgets"
         versionCode 1
         versionName "1.0"
     }
@@ -39,13 +39,13 @@
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
 
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 
     // Compose
@@ -57,7 +57,7 @@
         jvmTarget = "1.8"
     }
 
-    namespace "androidx.camera.integration.uiwidgets"
+    namespace = "androidx.camera.integration.uiwidgets"
 }
 
 dependencies {
diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle
index 5a84892..99f2fc0 100644
--- a/camera/integration-tests/viewfindertestapp/build.gradle
+++ b/camera/integration-tests/viewfindertestapp/build.gradle
@@ -23,16 +23,16 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.camera.integration.viewfinder"
+        applicationId = "androidx.camera.integration.viewfinder"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
-    namespace "androidx.camera.integration.viewfinder"
+    namespace = "androidx.camera.integration.viewfinder"
 }
 
 dependencies {
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index 9468a32..52a3337 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -22,9 +22,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.camera.integration.view"
+        applicationId = "androidx.camera.integration.view"
     }
 
     sourceSets {
@@ -37,14 +37,14 @@
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro")
         }
     }
 
-    namespace "androidx.camera.integration.view"
+    namespace = "androidx.camera.integration.view"
 }
 
 dependencies {
diff --git a/camera/media3/media3-effect/build.gradle b/camera/media3/media3-effect/build.gradle
index 717ed78..bb6eaf2 100644
--- a/camera/media3/media3-effect/build.gradle
+++ b/camera/media3/media3-effect/build.gradle
@@ -54,9 +54,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.media3.effect"
+    namespace = "androidx.camera.media3.effect"
     lint {
         baseline = file("lint-baseline.xml")
     }
diff --git a/camera/viewfinder/viewfinder-compose/build.gradle b/camera/viewfinder/viewfinder-compose/build.gradle
index e832210..d20e198 100644
--- a/camera/viewfinder/viewfinder-compose/build.gradle
+++ b/camera/viewfinder/viewfinder-compose/build.gradle
@@ -49,8 +49,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.camera.viewfinder.compose"
+    compileSdk = 35
+    namespace = "androidx.camera.viewfinder.compose"
 
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/camera/viewfinder/viewfinder-compose"
diff --git a/camera/viewfinder/viewfinder-core/build.gradle b/camera/viewfinder/viewfinder-core/build.gradle
index 6a94642..d323c42 100644
--- a/camera/viewfinder/viewfinder-core/build.gradle
+++ b/camera/viewfinder/viewfinder-core/build.gradle
@@ -46,7 +46,7 @@
 }
 
 android {
-    namespace "androidx.camera.viewfinder.core"
+    namespace = "androidx.camera.viewfinder.core"
 }
 
 androidx {
diff --git a/camera/viewfinder/viewfinder-core/samples/build.gradle b/camera/viewfinder/viewfinder-core/samples/build.gradle
index 3a3e589..0baad03 100644
--- a/camera/viewfinder/viewfinder-core/samples/build.gradle
+++ b/camera/viewfinder/viewfinder-core/samples/build.gradle
@@ -38,7 +38,7 @@
 }
 
 android {
-    namespace "androidx.camera.viewfinder.core.samples"
+    namespace = "androidx.camera.viewfinder.core.samples"
 }
 
 androidx {
diff --git a/camera/viewfinder/viewfinder-view/build.gradle b/camera/viewfinder/viewfinder-view/build.gradle
index b2854e8..7c4e5a6 100644
--- a/camera/viewfinder/viewfinder-view/build.gradle
+++ b/camera/viewfinder/viewfinder-view/build.gradle
@@ -72,7 +72,7 @@
     }
 
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.camera.viewfinder"
+    namespace = "androidx.camera.viewfinder"
     lintOptions {
         enable 'CameraXQuirksClassDetector'
     }
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index 1f213c9..cd090ce 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -58,21 +58,21 @@
 
 android {
     defaultConfig {
-        minSdkVersion 29
+        minSdk = 29
     }
     buildFeatures {
         aidl = true
     }
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
 
         stableAidl {
-            version 1
+            version = 1
         }
     }
     useLibrary 'android.car'
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.car.app.automotive"
+    namespace = "androidx.car.app.automotive"
 }
 
 androidx {
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index 91cd5dd..ceca603 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -51,15 +51,15 @@
         aidl = true
     }
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
 
         stableAidl {
-            version 1
+            version = 1
         }
     }
 
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.car.app.projected"
+    namespace = "androidx.car.app.projected"
 }
 
 androidx {
diff --git a/car/app/app-samples/navigation/automotive/build.gradle b/car/app/app-samples/navigation/automotive/build.gradle
index 11dd738..c7e3a8a 100644
--- a/car/app/app-samples/navigation/automotive/build.gradle
+++ b/car/app/app-samples/navigation/automotive/build.gradle
@@ -31,19 +31,19 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.car.app.sample.navigation"
-        minSdkVersion 29
+        applicationId = "androidx.car.app.sample.navigation"
+        minSdk = 29
     }
 
     buildTypes {
         release {
             // Enables code shrinking, obfuscation, and optimization.
-            minifyEnabled true
+            minifyEnabled = true
             proguardFiles getDefaultProguardFile(
                     'proguard-android-optimize.txt')
         }
     }
-    namespace "androidx.car.app.sample.navigation"
+    namespace = "androidx.car.app.sample.navigation"
 }
 
 dependencies {
diff --git a/car/app/app-samples/navigation/common/build.gradle b/car/app/app-samples/navigation/common/build.gradle
index d079e9e..823aba0 100644
--- a/car/app/app-samples/navigation/common/build.gradle
+++ b/car/app/app-samples/navigation/common/build.gradle
@@ -31,9 +31,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.car.app.sample.navigation.common"
+    namespace = "androidx.car.app.sample.navigation.common"
 }
 
 dependencies {
diff --git a/car/app/app-samples/navigation/mobile/build.gradle b/car/app/app-samples/navigation/mobile/build.gradle
index ac9a22b..7115855 100644
--- a/car/app/app-samples/navigation/mobile/build.gradle
+++ b/car/app/app-samples/navigation/mobile/build.gradle
@@ -30,19 +30,19 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.car.app.sample.navigation"
-        minSdkVersion 23
+        applicationId = "androidx.car.app.sample.navigation"
+        minSdk = 23
     }
 
     buildTypes {
         release {
             // Enables code shrinking, obfuscation, and optimization.
-            minifyEnabled true
+            minifyEnabled = true
             proguardFiles getDefaultProguardFile(
                     'proguard-android-optimize.txt')
         }
     }
-    namespace "androidx.car.app.sample.navigation"
+    namespace = "androidx.car.app.sample.navigation"
 }
 
 dependencies {
diff --git a/car/app/app-samples/showcase/automotive/build.gradle b/car/app/app-samples/showcase/automotive/build.gradle
index 97d12b6..9e9eea3 100644
--- a/car/app/app-samples/showcase/automotive/build.gradle
+++ b/car/app/app-samples/showcase/automotive/build.gradle
@@ -21,26 +21,26 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.car.app.sample.showcase"
-        minSdkVersion 29
+        applicationId = "androidx.car.app.sample.showcase"
+        minSdk = 29
         // Increment this to generate signed builds for uploading to Playstore
         // Make sure this is different from the showcase-mobile version
-        versionCode 107
-        versionName "107"
+        versionCode = 107
+        versionName = "107"
     }
 
     buildTypes {
         debug {
-            pseudoLocalesEnabled true
+            pseudoLocalesEnabled = true
         }
         release {
             // Enables code shrinking, obfuscation, and optimization.
-            minifyEnabled true
+            minifyEnabled = true
             proguardFiles getDefaultProguardFile(
                     'proguard-android-optimize.txt')
         }
     }
-    namespace "androidx.car.app.sample.showcase"
+    namespace = "androidx.car.app.sample.showcase"
 }
 
 dependencies {
diff --git a/car/app/app-samples/showcase/common/build.gradle b/car/app/app-samples/showcase/common/build.gradle
index cb05f0f..c06017e 100644
--- a/car/app/app-samples/showcase/common/build.gradle
+++ b/car/app/app-samples/showcase/common/build.gradle
@@ -31,9 +31,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.car.app.sample.showcase.common"
+    namespace = "androidx.car.app.sample.showcase.common"
 }
 
 dependencies {
diff --git a/car/app/app-samples/showcase/mobile/build.gradle b/car/app/app-samples/showcase/mobile/build.gradle
index ee2abc5..8ff680c 100644
--- a/car/app/app-samples/showcase/mobile/build.gradle
+++ b/car/app/app-samples/showcase/mobile/build.gradle
@@ -30,26 +30,26 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.car.app.sample.showcase"
-        minSdkVersion 23
+        applicationId = "androidx.car.app.sample.showcase"
+        minSdk = 23
         // Increment this to generate signed builds for uploading to Playstore
         // Make sure this is different from the showcase-automotive version
-        versionCode 106
-        versionName "106"
+        versionCode = 106
+        versionName = "106"
     }
 
     buildTypes {
         debug {
-            pseudoLocalesEnabled true
+            pseudoLocalesEnabled = true
         }
         release {
             // Enables code shrinking, obfuscation, and optimization.
-            minifyEnabled true
+            minifyEnabled = true
             proguardFiles getDefaultProguardFile(
                     'proguard-android-optimize.txt')
         }
     }
-    namespace "androidx.car.app.sample.showcase"
+    namespace = "androidx.car.app.sample.showcase"
 }
 
 dependencies {
diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index 32a737b..d4e2464 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -57,7 +57,7 @@
     lintOptions {
         disable("InvalidPackage")
     }
-    namespace "androidx.car.app.testing"
+    namespace = "androidx.car.app.testing"
 }
 
 androidx {
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index e34bec6..7cd5f17 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -94,16 +94,16 @@
     }
     defaultConfig {
         resValue "string", "car_app_library_version", androidx.LibraryVersions.CAR_APP.toString()
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
     }
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
 
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.car.app"
+    namespace = "androidx.car.app"
 }
 
 androidx {
diff --git a/cardview/cardview/build.gradle b/cardview/cardview/build.gradle
index eaafddc..293c6e6 100644
--- a/cardview/cardview/build.gradle
+++ b/cardview/cardview/build.gradle
@@ -26,5 +26,5 @@
 }
 
 android {
-    namespace "androidx.cardview"
+    namespace = "androidx.cardview"
 }
diff --git a/collection/collection-benchmark/build.gradle b/collection/collection-benchmark/build.gradle
index d21fc8e..2f5bdef 100644
--- a/collection/collection-benchmark/build.gradle
+++ b/collection/collection-benchmark/build.gradle
@@ -126,8 +126,8 @@
 }
 
 android {
-    namespace "androidx.collection.benchmark"
+    namespace = "androidx.collection.benchmark"
     defaultConfig {
-        minSdkVersion 22 // b/294570164
+        minSdk = 22 // b/294570164
     }
 }
diff --git a/compose/animation/animation-core/benchmark/build.gradle b/compose/animation/animation-core/benchmark/build.gradle
index 788f98d..838f0fe 100644
--- a/compose/animation/animation-core/benchmark/build.gradle
+++ b/compose/animation/animation-core/benchmark/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.compose.animation.core.benchmark"
+    namespace = "androidx.compose.animation.core.benchmark"
 }
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle
index db95848..5646413 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -55,6 +55,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.animation.core.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.animation.core.samples"
 }
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index 778cd29..151b44a 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -124,6 +124,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.animation.graphics"
+    compileSdk = 35
+    namespace = "androidx.compose.animation.graphics"
 }
diff --git a/compose/animation/animation-graphics/samples/build.gradle b/compose/animation/animation-graphics/samples/build.gradle
index eac57cb..eb3c65f 100644
--- a/compose/animation/animation-graphics/samples/build.gradle
+++ b/compose/animation/animation-graphics/samples/build.gradle
@@ -55,6 +55,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.animation.graphics.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.animation.graphics.samples"
 }
diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle
index d607c7f..4597408 100644
--- a/compose/animation/animation/integration-tests/animation-demos/build.gradle
+++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle
@@ -37,6 +37,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.animation.demos"
+    compileSdk = 35
+    namespace = "androidx.compose.animation.demos"
 }
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle
index 68f3b69..594f3b7 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -54,6 +54,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.animation.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.animation.samples"
 }
diff --git a/compose/benchmark-utils/benchmark/build.gradle b/compose/benchmark-utils/benchmark/build.gradle
index a4ad944..94968c5 100644
--- a/compose/benchmark-utils/benchmark/build.gradle
+++ b/compose/benchmark-utils/benchmark/build.gradle
@@ -34,6 +34,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.benchmarkutils.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.benchmarkutils.benchmark"
 }
diff --git a/compose/benchmark-utils/build.gradle b/compose/benchmark-utils/build.gradle
index 523e168..8c0ab7e 100644
--- a/compose/benchmark-utils/build.gradle
+++ b/compose/benchmark-utils/build.gradle
@@ -56,8 +56,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.benchmarkutils"
+    compileSdk = 35
+    namespace = "androidx.compose.benchmarkutils"
 
     // workarounds for b/328649293
     buildTypes.configureEach {
diff --git a/compose/foundation/foundation-layout/benchmark/build.gradle b/compose/foundation/foundation-layout/benchmark/build.gradle
index 8726ebd..3146ce7 100644
--- a/compose/foundation/foundation-layout/benchmark/build.gradle
+++ b/compose/foundation/foundation-layout/benchmark/build.gradle
@@ -39,6 +39,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.layout.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.layout.benchmark"
 }
diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
index d003d3f..a114c35 100644
--- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
+++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
@@ -37,6 +37,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.layout.demos"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.layout.demos"
 }
diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle
index d0a4261..65e1791 100644
--- a/compose/foundation/foundation-layout/samples/build.gradle
+++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -56,6 +56,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.layout.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.layout.samples"
 }
diff --git a/compose/foundation/foundation/benchmark/build.gradle b/compose/foundation/foundation/benchmark/build.gradle
index d06d861..254ee75 100644
--- a/compose/foundation/foundation/benchmark/build.gradle
+++ b/compose/foundation/foundation/benchmark/build.gradle
@@ -58,8 +58,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.benchmark"
 
     // DO NOT CHECK IN! Enable experimental benchmarking with R8 - for local runs only
     // buildTypes.release.androidTest.enableMinification = true
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index bd84d75..5500416 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -139,10 +139,10 @@
 
 // Screenshot tests related setup
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/foundation/foundation"
-    namespace "androidx.compose.foundation"
+    namespace = "androidx.compose.foundation"
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
index cec2c31..f278819 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
@@ -48,6 +48,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.demos"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.demos"
 }
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle b/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle
index e86a8c9..2fc3059 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle
@@ -30,8 +30,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.lazytests"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.lazytests"
 }
 
 dependencies {
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle
index 5f42e6a..0e4d5d2 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -59,8 +59,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.foundation.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.foundation.samples"
     // TODO(b/328001575)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index 8622500..d1d531c 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -46,6 +46,6 @@
 ApkCopyHelperKt.setupAppApkCopy(project, "release")
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.integration.demos"
+    compileSdk = 35
+    namespace = "androidx.compose.integration.demos"
 }
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle
index 34c02706..7d12175 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -30,5 +30,5 @@
 }
 
 android {
-    namespace "androidx.compose.integration.demos.common"
+    namespace = "androidx.compose.integration.demos.common"
 }
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle
index 7b9584b..d43b9a5 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -70,8 +70,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.integration.docs"
+    compileSdk = 35
+    namespace = "androidx.compose.integration.docs"
 }
 
-android.buildFeatures.viewBinding true
+android.buildFeatures.viewBinding = true
diff --git a/compose/integration-tests/hero/hero-common/hero-common-implementation/build.gradle b/compose/integration-tests/hero/hero-common/hero-common-implementation/build.gradle
index 717ce25..db36f8f 100644
--- a/compose/integration-tests/hero/hero-common/hero-common-implementation/build.gradle
+++ b/compose/integration-tests/hero/hero-common/hero-common-implementation/build.gradle
@@ -48,7 +48,7 @@
 }
 
 android {
-    namespace "androidx.compose.integration.hero.common.implementation"
+    namespace = "androidx.compose.integration.hero.common.implementation"
     compileSdk = 35
 }
 
diff --git a/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle b/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle
index 97c0edb..5182c08 100644
--- a/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle
+++ b/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle
@@ -43,7 +43,7 @@
 }
 
 android {
-    namespace "androidx.compose.integration.hero.common.macrobenchmark"
+    namespace = "androidx.compose.integration.hero.common.macrobenchmark"
 }
 
 androidx {
diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle
index e23923f..f36383c 100644
--- a/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle
+++ b/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle
@@ -22,21 +22,17 @@
 }
 
 android {
-    compileSdk 35
-    namespace 'androidx.compose.integration.hero.jetsnack.implementation'
+    compileSdk = 35
+    namespace = "androidx.compose.integration.hero.jetsnack.implementation"
 
     lint {
         // These projects should use the external lint checks to simulate real world development
         disable += ['PrimitiveInCollection', 'AsCollectionCall']
     }
 
-    defaultConfig {
-        minSdk 21
-    }
-
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle
index 780d0fc..da8f875 100644
--- a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle
@@ -22,13 +22,13 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "androidx.compose.integration.hero.jetsnack.macrobenchmark.target"
+    compileSdk = 35
+    namespace = "androidx.compose.integration.hero.jetsnack.macrobenchmark.target"
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle
index f00b483..226fab6 100644
--- a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle
+++ b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.compose.integration.hero.jetsnack.macrobenchmark"
+    namespace = "androidx.compose.integration.hero.jetsnack.macrobenchmark"
     targetProjectPath = ":compose:integration-tests:hero:jetsnack:jetsnack-macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle
index 0b3d32b..fc2f32b9 100644
--- a/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle
+++ b/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle
@@ -56,9 +56,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.compose.integration.hero.jetsnack.microbenchmark"
+    namespace = "androidx.compose.integration.hero.jetsnack.microbenchmark"
 }
 
 androidx {
diff --git a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle
index 315fcc8..2e14c66 100644
--- a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle
@@ -22,13 +22,13 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "androidx.compose.integration.hero.pokedex.macrobenchmark.target"
+    compileSdk = 35
+    namespace = "androidx.compose.integration.hero.pokedex.macrobenchmark.target"
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
diff --git a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle
index 98a7f91..cfc6df2 100644
--- a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle
+++ b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.compose.integration.hero.pokedex.macrobenchmark"
+    namespace = "androidx.compose.integration.hero.pokedex.macrobenchmark"
     targetProjectPath = ":compose:integration-tests:hero:pokedex:pokedex-macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index e46e47c..b9d6812 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -13,18 +13,18 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.integration.macrobenchmark.target"
+    compileSdk = 35
+    namespace = "androidx.compose.integration.macrobenchmark.target"
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),
                     'proguard-rules.pro'
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 }
 
diff --git a/compose/integration-tests/macrobenchmark/build.gradle b/compose/integration-tests/macrobenchmark/build.gradle
index 7739110..a20fbea 100644
--- a/compose/integration-tests/macrobenchmark/build.gradle
+++ b/compose/integration-tests/macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.compose.integration.macrobenchmark"
+    namespace = "androidx.compose.integration.macrobenchmark"
     targetProjectPath = ":compose:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/compose/integration-tests/material-catalog/build.gradle b/compose/integration-tests/material-catalog/build.gradle
index 0a420bb..e2ab46c 100644
--- a/compose/integration-tests/material-catalog/build.gradle
+++ b/compose/integration-tests/material-catalog/build.gradle
@@ -32,20 +32,20 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.compose.material.catalog"
+        applicationId = "androidx.compose.material.catalog"
         versionCode 2500
         versionName "2.5.0"
     }
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
         }
     }
-    namespace "androidx.compose.material.catalog"
+    namespace = "androidx.compose.material.catalog"
 }
 
 dependencies {
diff --git a/compose/material/material-navigation/build.gradle b/compose/material/material-navigation/build.gradle
index 519a6c6..6d3b9f4 100644
--- a/compose/material/material-navigation/build.gradle
+++ b/compose/material/material-navigation/build.gradle
@@ -53,8 +53,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material.navigation"
+    compileSdk = 35
+    namespace = "androidx.compose.material.navigation"
     // TODO(b/349411310)?
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/material/material-navigation/samples/build.gradle b/compose/material/material-navigation/samples/build.gradle
index 0e1cdc4..2f06c01 100644
--- a/compose/material/material-navigation/samples/build.gradle
+++ b/compose/material/material-navigation/samples/build.gradle
@@ -51,6 +51,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material.navigation.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.material.navigation.samples"
 }
diff --git a/compose/material/material-ripple/benchmark/build.gradle b/compose/material/material-ripple/benchmark/build.gradle
index 72173e4..1da1934 100644
--- a/compose/material/material-ripple/benchmark/build.gradle
+++ b/compose/material/material-ripple/benchmark/build.gradle
@@ -46,9 +46,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.compose.material.ripple.benchmark"
+    namespace = "androidx.compose.material.ripple.benchmark"
 }
 
 androidx {
diff --git a/compose/material/material/benchmark/build.gradle b/compose/material/material/benchmark/build.gradle
index d727fef..8a8f1b9 100644
--- a/compose/material/material/benchmark/build.gradle
+++ b/compose/material/material/benchmark/build.gradle
@@ -49,8 +49,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.material.benchmark"
 }
 
 androidx {
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 85e7c36..3b67763b 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -145,8 +145,8 @@
 
 // Screenshot tests related setup
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/material/material"
-    namespace "androidx.compose.material"
+    namespace = "androidx.compose.material"
 }
diff --git a/compose/material/material/integration-tests/material-catalog/build.gradle b/compose/material/material/integration-tests/material-catalog/build.gradle
index 31c9cef..c9aa047 100644
--- a/compose/material/material/integration-tests/material-catalog/build.gradle
+++ b/compose/material/material/integration-tests/material-catalog/build.gradle
@@ -49,6 +49,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material.catalog.library"
+    compileSdk = 35
+    namespace = "androidx.compose.material.catalog.library"
 }
diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle
index a9bb660..78535df 100644
--- a/compose/material/material/integration-tests/material-demos/build.gradle
+++ b/compose/material/material/integration-tests/material-demos/build.gradle
@@ -37,6 +37,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material.demos"
+    compileSdk = 35
+    namespace = "androidx.compose.material.demos"
 }
diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle
index 84b77f2..8d98e69 100644
--- a/compose/material/material/samples/build.gradle
+++ b/compose/material/material/samples/build.gradle
@@ -58,8 +58,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.material.samples"
     // TODO(b/328001575)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/material3/adaptive/adaptive-layout/build.gradle b/compose/material3/adaptive/adaptive-layout/build.gradle
index 71d3e2f..56d63c4 100644
--- a/compose/material3/adaptive/adaptive-layout/build.gradle
+++ b/compose/material3/adaptive/adaptive-layout/build.gradle
@@ -114,8 +114,8 @@
 
 // Screenshot tests related setup
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/material3/adaptive"
-    namespace "androidx.compose.material3.adaptive.layout"
+    namespace = "androidx.compose.material3.adaptive.layout"
 }
diff --git a/compose/material3/adaptive/adaptive-navigation/build.gradle b/compose/material3/adaptive/adaptive-navigation/build.gradle
index 7992414..759ce50 100644
--- a/compose/material3/adaptive/adaptive-navigation/build.gradle
+++ b/compose/material3/adaptive/adaptive-navigation/build.gradle
@@ -97,7 +97,7 @@
 }
 
 android {
-    namespace "androidx.compose.material3.adaptive.navigation"
+    namespace = "androidx.compose.material3.adaptive.navigation"
 }
 
 androidx {
@@ -111,8 +111,8 @@
 
 // Screenshot tests related setup
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/material3/adaptive"
-    namespace "androidx.compose.material3.adaptive.navigation"
+    namespace = "androidx.compose.material3.adaptive.navigation"
 }
diff --git a/compose/material3/adaptive/adaptive/build.gradle b/compose/material3/adaptive/adaptive/build.gradle
index 586a796..6dc0ad0 100644
--- a/compose/material3/adaptive/adaptive/build.gradle
+++ b/compose/material3/adaptive/adaptive/build.gradle
@@ -97,7 +97,7 @@
 }
 
 android {
-    namespace "androidx.compose.material3.adaptive"
+    namespace = "androidx.compose.material3.adaptive"
 }
 
 androidx {
@@ -111,8 +111,8 @@
 
 // Screenshot tests related setup
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/material3/adaptive"
-    namespace "androidx.compose.material3.adaptive"
+    namespace = "androidx.compose.material3.adaptive"
 }
diff --git a/compose/material3/adaptive/benchmark/build.gradle b/compose/material3/adaptive/benchmark/build.gradle
index 95ff74a..54b0da4 100644
--- a/compose/material3/adaptive/benchmark/build.gradle
+++ b/compose/material3/adaptive/benchmark/build.gradle
@@ -34,6 +34,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.adaptive.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.adaptive.benchmark"
 }
diff --git a/compose/material3/adaptive/samples/build.gradle b/compose/material3/adaptive/samples/build.gradle
index b9270f2..af3ca01 100644
--- a/compose/material3/adaptive/samples/build.gradle
+++ b/compose/material3/adaptive/samples/build.gradle
@@ -60,7 +60,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.compose.material3.adaptive.samples"
+    namespace = "androidx.compose.material3.adaptive.samples"
 }
diff --git a/compose/material3/benchmark/build.gradle b/compose/material3/benchmark/build.gradle
index 3018b05..618db30 100644
--- a/compose/material3/benchmark/build.gradle
+++ b/compose/material3/benchmark/build.gradle
@@ -38,6 +38,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.benchmark"
 }
\ No newline at end of file
diff --git a/compose/material3/integration-tests/macrobenchmark-target/build.gradle b/compose/material3/integration-tests/macrobenchmark-target/build.gradle
index c3ee0c6..47c6f31 100644
--- a/compose/material3/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/material3/integration-tests/macrobenchmark-target/build.gradle
@@ -6,15 +6,15 @@
 }
 
 android {
-    namespace 'androidx.compose.material3.integration.macrobenchmark.target'
+    namespace = "androidx.compose.material3.integration.macrobenchmark.target"
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileSdkVersion 35
+    compileSdk = 35
 }
 
 dependencies {
diff --git a/compose/material3/integration-tests/macrobenchmark/build.gradle b/compose/material3/integration-tests/macrobenchmark/build.gradle
index d26b965..639cbf8 100644
--- a/compose/material3/integration-tests/macrobenchmark/build.gradle
+++ b/compose/material3/integration-tests/macrobenchmark/build.gradle
@@ -6,12 +6,12 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
     testOptions {
         animationsDisabled = false
     }
-    namespace 'androidx.compose.material3.integration.macrobenchmark'
+    namespace = "androidx.compose.material3.integration.macrobenchmark"
     targetProjectPath = ":compose:material3:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle b/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle
index f7365c5..081b1ab 100644
--- a/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle
+++ b/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle
@@ -60,6 +60,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.adaptive.navigationsuite.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.adaptive.navigationsuite.samples"
 }
diff --git a/compose/material3/material3-common/samples/build.gradle b/compose/material3/material3-common/samples/build.gradle
index 6c1bacf..28d0d89 100644
--- a/compose/material3/material3-common/samples/build.gradle
+++ b/compose/material3/material3-common/samples/build.gradle
@@ -55,6 +55,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.common.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.common.samples"
 }
diff --git a/compose/material3/material3-window-size-class/samples/build.gradle b/compose/material3/material3-window-size-class/samples/build.gradle
index 91b8ad3..f84004b 100644
--- a/compose/material3/material3-window-size-class/samples/build.gradle
+++ b/compose/material3/material3-window-size-class/samples/build.gradle
@@ -52,6 +52,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.windowsizeclass.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.windowsizeclass.samples"
 }
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index 60c87ec..7afa815 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -141,10 +141,10 @@
 
 // Screenshot tests related setup
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/material3/material3"
-    namespace "androidx.compose.material3"
+    namespace = "androidx.compose.material3"
     // TODO(b/345531033)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/material3/material3/integration-tests/material3-catalog/build.gradle b/compose/material3/material3/integration-tests/material3-catalog/build.gradle
index 23f8592..fc3f343 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/build.gradle
+++ b/compose/material3/material3/integration-tests/material3-catalog/build.gradle
@@ -55,6 +55,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.catalog.library"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.catalog.library"
 }
diff --git a/compose/material3/material3/integration-tests/material3-demos/build.gradle b/compose/material3/material3/integration-tests/material3-demos/build.gradle
index 539b8cb..510bd2e 100644
--- a/compose/material3/material3/integration-tests/material3-demos/build.gradle
+++ b/compose/material3/material3/integration-tests/material3-demos/build.gradle
@@ -55,6 +55,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.material3.demos"
+    compileSdk = 35
+    namespace = "androidx.compose.material3.demos"
 }
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index 1cfa87e..9073da6 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -63,9 +63,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.compose.material3.samples"
+    namespace = "androidx.compose.material3.samples"
     // TODO(b/328001575)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index 0b18abc..88f6d74 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -59,6 +59,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.livedata"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.livedata"
 }
diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle
index 1a2df3a..4669de24 100644
--- a/compose/runtime/runtime-livedata/samples/build.gradle
+++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -50,6 +50,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.livedata.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.livedata.samples"
 }
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 6b9c97f..eb8b3f4 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -57,6 +57,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.rxjava2"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.rxjava2"
 }
diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle
index f7a97aa..a706fe7 100644
--- a/compose/runtime/runtime-rxjava2/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -50,6 +50,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.rxjava2.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.rxjava2.samples"
 }
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle
index c06cd10..2b64bb5 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -57,6 +57,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.rxjava3"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.rxjava3"
 }
diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle
index 9d6b156..e9a3a5d 100644
--- a/compose/runtime/runtime-rxjava3/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -50,6 +50,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.rxjava3.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.rxjava3.samples"
 }
diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle
index c1c5fa0..0347e4c 100644
--- a/compose/runtime/runtime-saveable/build.gradle
+++ b/compose/runtime/runtime-saveable/build.gradle
@@ -119,6 +119,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.saveable"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.saveable"
 }
diff --git a/compose/runtime/runtime-saveable/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle
index 89ac64c..3bcc90b 100644
--- a/compose/runtime/runtime-saveable/samples/build.gradle
+++ b/compose/runtime/runtime-saveable/samples/build.gradle
@@ -53,6 +53,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.saveable.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.saveable.samples"
 }
diff --git a/compose/runtime/runtime-tracing/build.gradle b/compose/runtime/runtime-tracing/build.gradle
index d436226..a6919c8 100644
--- a/compose/runtime/runtime-tracing/build.gradle
+++ b/compose/runtime/runtime-tracing/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.compose.runtime.tracing"
+    namespace = "androidx.compose.runtime.tracing"
 }
 
 dependencies {
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index fb2f039..bbff188 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -138,7 +138,7 @@
     defaultConfig {
         consumerProguardFiles 'proguard-rules.pro'
     }
-    namespace "androidx.compose.runtime"
+    namespace = "androidx.compose.runtime"
 }
 
 androidx {
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
index 12036c5..ce213f7 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
+++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
@@ -22,8 +22,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.benchmark"
 }
 
 dependencies {
diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle
index 5ac8fb5..cd99111 100644
--- a/compose/runtime/runtime/samples/build.gradle
+++ b/compose/runtime/runtime/samples/build.gradle
@@ -52,6 +52,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.runtime.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.runtime.samples"
 }
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle
index 4e9e30d..b8bb931 100644
--- a/compose/test-utils/build.gradle
+++ b/compose/test-utils/build.gradle
@@ -107,6 +107,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.testutils"
+    compileSdk = 35
+    namespace = "androidx.compose.testutils"
 }
diff --git a/compose/ui/ui-android-stubs/build.gradle b/compose/ui/ui-android-stubs/build.gradle
index da858f2..7ff0de3 100644
--- a/compose/ui/ui-android-stubs/build.gradle
+++ b/compose/ui/ui-android-stubs/build.gradle
@@ -41,5 +41,5 @@
 }
 
 android {
-    namespace "androidx.compose.ui.androidstubs"
+    namespace = "androidx.compose.ui.androidstubs"
 }
diff --git a/compose/ui/ui-graphics/benchmark/build.gradle b/compose/ui/ui-graphics/benchmark/build.gradle
index 680479b..8ad2df7 100644
--- a/compose/ui/ui-graphics/benchmark/build.gradle
+++ b/compose/ui/ui-graphics/benchmark/build.gradle
@@ -34,6 +34,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.graphics.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.graphics.benchmark"
 }
diff --git a/compose/ui/ui-graphics/benchmark/test/build.gradle b/compose/ui/ui-graphics/benchmark/test/build.gradle
index 6823007..517f004 100644
--- a/compose/ui/ui-graphics/benchmark/test/build.gradle
+++ b/compose/ui/ui-graphics/benchmark/test/build.gradle
@@ -35,6 +35,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.graphics.benchmark.test"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.graphics.benchmark.test"
 }
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 842022a..42509be 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -127,8 +127,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.graphics"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.graphics"
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle
index 99fb0f8..a28410d 100644
--- a/compose/ui/ui-graphics/samples/build.gradle
+++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -53,6 +53,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.graphics.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.graphics.samples"
 }
diff --git a/compose/ui/ui-inspection/build.gradle b/compose/ui/ui-inspection/build.gradle
index 3423082..a2ea59f 100644
--- a/compose/ui/ui-inspection/build.gradle
+++ b/compose/ui/ui-inspection/build.gradle
@@ -48,7 +48,7 @@
     // we ignore its transitive dependencies, because ui-inspection should
     // depend on them as "compile-only" deps.
     implementation(project(":compose:ui:ui-tooling-data"), {
-        transitive(false)
+        transitive = false
     })
     implementation(libs.kotlinReflect, {
         exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib"
@@ -82,10 +82,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         // layout inspection supported starting on Android Q
-        minSdkVersion 29
+        minSdk = 29
     }
 
     sourceSets {
@@ -95,10 +95,10 @@
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
         }
     }
-    namespace "androidx.compose.ui.inspection"
+    namespace = "androidx.compose.ui.inspection"
 }
 
 inspection {
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index 4885b12..084cd00 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -113,11 +113,11 @@
 
 
 android {
-    compileSdk 35
+    compileSdk = 35
     lintOptions {
         disable("InvalidPackage")
     }
-    namespace "androidx.compose.ui.test.junit4"
+    namespace = "androidx.compose.ui.test.junit4"
 }
 
 androidx {
diff --git a/compose/ui/ui-test-manifest/build.gradle b/compose/ui/ui-test-manifest/build.gradle
index d79ee4b..3405de2 100644
--- a/compose/ui/ui-test-manifest/build.gradle
+++ b/compose/ui/ui-test-manifest/build.gradle
@@ -44,5 +44,5 @@
 }
 
 android {
-    namespace "androidx.compose.ui.test.manifest"
+    namespace = "androidx.compose.ui.test.manifest"
 }
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
index 387b078..a0957a4 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
@@ -33,6 +33,6 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "androidx.compose.ui.test.manifest.integration.testapp"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.test.manifest.integration.testapp"
 }
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
index 00471bb..b2e420d 100644
--- a/compose/ui/ui-test/build.gradle
+++ b/compose/ui/ui-test/build.gradle
@@ -141,7 +141,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets {
         test.java.srcDirs += "src/androidCommonTest/kotlin"
         androidTest.java.srcDirs += "src/androidCommonTest/kotlin"
@@ -150,7 +150,7 @@
     lintOptions {
         disable("InvalidPackage")
     }
-    namespace "androidx.compose.ui.test"
+    namespace = "androidx.compose.ui.test"
     // TODO(b/345531033)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/ui/ui-test/samples/build.gradle b/compose/ui/ui-test/samples/build.gradle
index f43e31c..6862179 100644
--- a/compose/ui/ui-test/samples/build.gradle
+++ b/compose/ui/ui-test/samples/build.gradle
@@ -57,6 +57,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.test.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.test.samples"
 }
diff --git a/compose/ui/ui-text-google-fonts/build.gradle b/compose/ui/ui-text-google-fonts/build.gradle
index 917f32e..664548e 100644
--- a/compose/ui/ui-text-google-fonts/build.gradle
+++ b/compose/ui/ui-text-google-fonts/build.gradle
@@ -58,6 +58,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.text.googlefonts"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.text.googlefonts"
 }
diff --git a/compose/ui/ui-text/benchmark/build.gradle b/compose/ui/ui-text/benchmark/build.gradle
index 8bfa343..ae3f95f 100644
--- a/compose/ui/ui-text/benchmark/build.gradle
+++ b/compose/ui/ui-text/benchmark/build.gradle
@@ -39,6 +39,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.text.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.text.benchmark"
 }
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index 86f8a51..7d24671 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -149,8 +149,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.text"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.text"
     // TODO(b/328001575)
     experimentalProperties["android.lint.useK2Uast"] = false
     buildTypes.configureEach {
diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle
index b6778fb..2618ac9 100644
--- a/compose/ui/ui-text/samples/build.gradle
+++ b/compose/ui/ui-text/samples/build.gradle
@@ -54,8 +54,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.text.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.text.samples"
     // TODO(b/328001575)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index 6c7d92f..08c9f4f1 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -123,8 +123,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.tooling"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.tooling"
     // TODO(b/345531033)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle
index aed7f5f..5413b29 100644
--- a/compose/ui/ui-unit/samples/build.gradle
+++ b/compose/ui/ui-unit/samples/build.gradle
@@ -54,6 +54,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.unit.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.unit.samples"
 }
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index 45759c8..d585c16 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -61,6 +61,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.viewbinding"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.viewbinding"
 }
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index 5d16a55..1b12b00 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -61,9 +61,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.compose.ui.viewbinding.samples"
+    namespace = "androidx.compose.ui.viewbinding.samples"
 }
diff --git a/compose/ui/ui/benchmark/build.gradle b/compose/ui/ui/benchmark/build.gradle
index 9cff02b..216aa33 100644
--- a/compose/ui/ui/benchmark/build.gradle
+++ b/compose/ui/ui/benchmark/build.gradle
@@ -50,8 +50,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.benchmark"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.benchmark"
 }
 
 androidx {
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 74982c0..60d27f7 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -222,7 +222,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     testOptions.unitTests.includeAndroidResources = true
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
@@ -235,8 +235,8 @@
 android {
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/compose/ui/ui"
-    namespace "androidx.compose.ui"
+    namespace = "androidx.compose.ui"
     // namespace has to be unique, but default androidx.compose.ui.test package is taken by
     // the androidx.compose.ui:ui-test library
-    testNamespace "androidx.compose.ui.tests"
+    testNamespace = "androidx.compose.ui.tests"
 }
diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle
index 0f9cc3a..213e01c 100644
--- a/compose/ui/ui/integration-tests/ui-demos/build.gradle
+++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle
@@ -46,11 +46,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.compose.ui.demos"
+    namespace = "androidx.compose.ui.demos"
     // TODO(b/349411310)?
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle
index 64e101b..4ceaaee 100644
--- a/compose/ui/ui/samples/build.gradle
+++ b/compose/ui/ui/samples/build.gradle
@@ -56,6 +56,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.compose.ui.samples"
+    compileSdk = 35
+    namespace = "androidx.compose.ui.samples"
 }
diff --git a/constraintlayout/constraintlayout-compose/build.gradle b/constraintlayout/constraintlayout-compose/build.gradle
index 12fc6dc..333e65d 100644
--- a/constraintlayout/constraintlayout-compose/build.gradle
+++ b/constraintlayout/constraintlayout-compose/build.gradle
@@ -116,6 +116,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.constraintlayout.compose"
+    compileSdk = 35
+    namespace = "androidx.constraintlayout.compose"
 }
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle
index 1487928..d821fc0 100644
--- a/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle
+++ b/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle
@@ -36,6 +36,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.constraintlayout.compose.benchmark"
+    compileSdk = 35
+    namespace = "androidx.constraintlayout.compose.benchmark"
 }
\ No newline at end of file
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle
index 7699379..2eae354 100644
--- a/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle
+++ b/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle
@@ -36,7 +36,7 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.constraintlayout.compose.demos"
+    compileSdk = 35
+    namespace = "androidx.constraintlayout.compose.demos"
 }
 
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle
index 0abe571..a960a9e 100644
--- a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle
@@ -22,19 +22,18 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.constraintlayout.compose.integration.macrobenchmark.target"
+    namespace = "androidx.constraintlayout.compose.integration.macrobenchmark.target"
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),
                     'proguard-rules.pro'
-            signingConfig signingConfigs.debug
         }
     }
 }
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle
index 2f9c076..b308e6e 100644
--- a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle
+++ b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.constraintlayout.compose.integration.macrobenchmark"
+    namespace = "androidx.constraintlayout.compose.integration.macrobenchmark"
 
     targetProjectPath = ":constraintlayout:constraintlayout-compose:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
diff --git a/constraintlayout/constraintlayout-compose/samples/build.gradle b/constraintlayout/constraintlayout-compose/samples/build.gradle
index 4381aef..479afb6 100644
--- a/constraintlayout/constraintlayout-compose/samples/build.gradle
+++ b/constraintlayout/constraintlayout-compose/samples/build.gradle
@@ -42,6 +42,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.constraintlayout.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.constraintlayout.compose.samples"
 }
diff --git a/constraintlayout/constraintlayout/build.gradle b/constraintlayout/constraintlayout/build.gradle
index 1844e81..727877e 100644
--- a/constraintlayout/constraintlayout/build.gradle
+++ b/constraintlayout/constraintlayout/build.gradle
@@ -40,7 +40,7 @@
 }
 
 android {
-    namespace "androidx.constraintlayout.widget"
+    namespace = "androidx.constraintlayout.widget"
 }
 
 androidx {
diff --git a/contentpager/contentpager/build.gradle b/contentpager/contentpager/build.gradle
index a873782..c4c8acd 100644
--- a/contentpager/contentpager/build.gradle
+++ b/contentpager/contentpager/build.gradle
@@ -50,5 +50,5 @@
 }
 
 android {
-    namespace "androidx.contentpager"
+    namespace = "androidx.contentpager"
 }
diff --git a/coordinatorlayout/coordinatorlayout/build.gradle b/coordinatorlayout/coordinatorlayout/build.gradle
index f099007..26b50d6 100644
--- a/coordinatorlayout/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/coordinatorlayout/build.gradle
@@ -49,7 +49,7 @@
         animationsDisabled = true
     }
 
-    namespace "androidx.coordinatorlayout"
+    namespace = "androidx.coordinatorlayout"
 }
 
 androidx {
diff --git a/core/core-animation-integration-tests/testapp/build.gradle b/core/core-animation-integration-tests/testapp/build.gradle
index fdabe96..389b42d 100644
--- a/core/core-animation-integration-tests/testapp/build.gradle
+++ b/core/core-animation-integration-tests/testapp/build.gradle
@@ -31,5 +31,5 @@
 }
 
 android {
-    namespace "androidx.core.animation.testapp"
+    namespace = "androidx.core.animation.testapp"
 }
diff --git a/core/core-animation-testing/build.gradle b/core/core-animation-testing/build.gradle
index a2ce659..e9230ab 100644
--- a/core/core-animation-testing/build.gradle
+++ b/core/core-animation-testing/build.gradle
@@ -44,5 +44,5 @@
 }
 
 android {
-    namespace "androidx.core.animation.testing"
+    namespace = "androidx.core.animation.testing"
 }
diff --git a/core/core-animation/build.gradle b/core/core-animation/build.gradle
index 07066f2..e1547b1 100644
--- a/core/core-animation/build.gradle
+++ b/core/core-animation/build.gradle
@@ -47,5 +47,5 @@
 }
 
 android {
-    namespace "androidx.core.animation"
+    namespace = "androidx.core.animation"
 }
diff --git a/core/core-appdigest/build.gradle b/core/core-appdigest/build.gradle
index f60ce51..dfcce86 100644
--- a/core/core-appdigest/build.gradle
+++ b/core/core-appdigest/build.gradle
@@ -49,6 +49,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.core.appdigest"
+    compileSdk = 35
+    namespace = "androidx.core.appdigest"
 }
diff --git a/core/core-backported-fixes/build.gradle b/core/core-backported-fixes/build.gradle
index 084d009..d3e1054 100644
--- a/core/core-backported-fixes/build.gradle
+++ b/core/core-backported-fixes/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    namespace "androidx.core.backported.fixes"
+    namespace = "androidx.core.backported.fixes"
 }
 
 androidx {
diff --git a/core/core-google-shortcuts/build.gradle b/core/core-google-shortcuts/build.gradle
index 39be349..3df349b 100644
--- a/core/core-google-shortcuts/build.gradle
+++ b/core/core-google-shortcuts/build.gradle
@@ -27,7 +27,7 @@
         consumerProguardFiles "proguard-rules.pro"
     }
 
-    namespace "androidx.core.google.shortcuts"
+    namespace = "androidx.core.google.shortcuts"
 }
 
 dependencies {
diff --git a/core/core-graphics-integration-tests/testapp/build.gradle b/core/core-graphics-integration-tests/testapp/build.gradle
index 21462c7..e965da7 100644
--- a/core/core-graphics-integration-tests/testapp/build.gradle
+++ b/core/core-graphics-integration-tests/testapp/build.gradle
@@ -21,11 +21,11 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.core.graphics.sample"
+        applicationId = "androidx.core.graphics.sample"
     }
-    namespace "androidx.core.graphics.sample"
+    namespace = "androidx.core.graphics.sample"
 }
 
 dependencies {
diff --git a/core/core-i18n/build.gradle b/core/core-i18n/build.gradle
index 73f1e1a..140d4d4 100644
--- a/core/core-i18n/build.gradle
+++ b/core/core-i18n/build.gradle
@@ -51,8 +51,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.core.i18n"
+    compileSdk = 35
+    namespace = "androidx.core.i18n"
     defaultConfig {
     }
 }
diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle
index 39b3cef..bacf6ec 100644
--- a/core/core-ktx/build.gradle
+++ b/core/core-ktx/build.gradle
@@ -42,6 +42,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.core.ktx"
+    compileSdk = 35
+    namespace = "androidx.core.ktx"
 }
diff --git a/core/core-location-altitude/build.gradle b/core/core-location-altitude/build.gradle
index a2be1c3..4b7e3c2 100644
--- a/core/core-location-altitude/build.gradle
+++ b/core/core-location-altitude/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.core.location.altitude"
+    namespace = "androidx.core.location.altitude"
 
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
diff --git a/core/core-performance-play-services/build.gradle b/core/core-performance-play-services/build.gradle
index eeea8de..e4c62f3 100644
--- a/core/core-performance-play-services/build.gradle
+++ b/core/core-performance-play-services/build.gradle
@@ -47,9 +47,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
-    namespace "androidx.core.performance.play.services"
+    namespace = "androidx.core.performance.play.services"
 }
 
 androidx {
diff --git a/core/core-performance-play-services/integration-tests/testapp/build.gradle b/core/core-performance-play-services/integration-tests/testapp/build.gradle
index 6e1208a..496717f 100644
--- a/core/core-performance-play-services/integration-tests/testapp/build.gradle
+++ b/core/core-performance-play-services/integration-tests/testapp/build.gradle
@@ -29,9 +29,9 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.core.performance.play.services.testapp"
-        minSdkVersion 24
+        applicationId = "androidx.core.performance.play.services.testapp"
+        minSdk = 24
     }
 
-    namespace "androidx.core.performance.play.services.testapp"
+    namespace = "androidx.core.performance.play.services.testapp"
 }
\ No newline at end of file
diff --git a/core/core-performance-testing/build.gradle b/core/core-performance-testing/build.gradle
index 9e8b6ff..f60dc4c 100644
--- a/core/core-performance-testing/build.gradle
+++ b/core/core-performance-testing/build.gradle
@@ -43,7 +43,7 @@
 }
 
 android {
-    namespace "androidx.core.performance.testing"
+    namespace = "androidx.core.performance.testing"
 }
 
 androidx {
diff --git a/core/core-performance/build.gradle b/core/core-performance/build.gradle
index 7b6a8bb..dbf8944 100644
--- a/core/core-performance/build.gradle
+++ b/core/core-performance/build.gradle
@@ -54,5 +54,5 @@
 }
 
 android {
-    namespace "androidx.core.performance"
+    namespace = "androidx.core.performance"
 }
diff --git a/core/core-performance/integration-tests/testapp/build.gradle b/core/core-performance/integration-tests/testapp/build.gradle
index 64e7228..d5c2e6d 100644
--- a/core/core-performance/integration-tests/testapp/build.gradle
+++ b/core/core-performance/integration-tests/testapp/build.gradle
@@ -28,9 +28,9 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.core.performance.testapp"
-        minSdkVersion 24
+        applicationId = "androidx.core.performance.testapp"
+        minSdk = 24
     }
 
-    namespace "androidx.core.performance.testapp"
+    namespace = "androidx.core.performance.testapp"
 }
\ No newline at end of file
diff --git a/core/core-performance/integration-tests/testlib/build.gradle b/core/core-performance/integration-tests/testlib/build.gradle
index 935affb..6fb5b8d 100644
--- a/core/core-performance/integration-tests/testlib/build.gradle
+++ b/core/core-performance/integration-tests/testlib/build.gradle
@@ -28,8 +28,8 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 
-    namespace "androidx.core.performance.testlib"
+    namespace = "androidx.core.performance.testlib"
 }
diff --git a/core/core-performance/samples/build.gradle b/core/core-performance/samples/build.gradle
index 522219d..0ceab72 100644
--- a/core/core-performance/samples/build.gradle
+++ b/core/core-performance/samples/build.gradle
@@ -46,7 +46,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
-    namespace "androidx.core.performance.samples"
+    namespace = "androidx.core.performance.samples"
 }
diff --git a/core/core-remoteviews/build.gradle b/core/core-remoteviews/build.gradle
index 5791485..943c9ad 100644
--- a/core/core-remoteviews/build.gradle
+++ b/core/core-remoteviews/build.gradle
@@ -60,7 +60,7 @@
             includeAndroidResources = true
         }
     }
-    namespace "androidx.core.remoteviews"
+    namespace = "androidx.core.remoteviews"
 }
 
 androidx {
diff --git a/core/core-remoteviews/integration-tests/demos/build.gradle b/core/core-remoteviews/integration-tests/demos/build.gradle
index a34011e..09f2dd8 100644
--- a/core/core-remoteviews/integration-tests/demos/build.gradle
+++ b/core/core-remoteviews/integration-tests/demos/build.gradle
@@ -27,5 +27,5 @@
 }
 
 android {
-    namespace "androidx.core.remoteviews.demos"
+    namespace = "androidx.core.remoteviews.demos"
 }
\ No newline at end of file
diff --git a/core/core-role/build.gradle b/core/core-role/build.gradle
index a31f66f..cef8b49 100644
--- a/core/core-role/build.gradle
+++ b/core/core-role/build.gradle
@@ -29,5 +29,5 @@
 }
 
 android {
-    namespace "androidx.core.role"
+    namespace = "androidx.core.role"
 }
diff --git a/core/core-splashscreen/build.gradle b/core/core-splashscreen/build.gradle
index 3ffa382..422adff 100644
--- a/core/core-splashscreen/build.gradle
+++ b/core/core-splashscreen/build.gradle
@@ -30,8 +30,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.core.splashscreen"
+    compileSdk = 35
+    namespace = "androidx.core.splashscreen"
 }
 
 dependencies {
diff --git a/core/core-splashscreen/samples/build.gradle b/core/core-splashscreen/samples/build.gradle
index 09a3102..2417028 100644
--- a/core/core-splashscreen/samples/build.gradle
+++ b/core/core-splashscreen/samples/build.gradle
@@ -31,11 +31,11 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.core.splashscreen.samples"
+        applicationId = "androidx.core.splashscreen.samples"
     }
-    namespace "androidx.core.splashscreen.sample"
+    namespace = "androidx.core.splashscreen.sample"
 }
 
 dependencies {
diff --git a/core/core-telecom/build.gradle b/core/core-telecom/build.gradle
index 8345db2..4cf939a 100644
--- a/core/core-telecom/build.gradle
+++ b/core/core-telecom/build.gradle
@@ -51,7 +51,7 @@
 }
 
 android {
-    namespace "androidx.core.telecom"
+    namespace = "androidx.core.telecom"
     buildFeatures {
         aidl = true
     }
diff --git a/core/core-telecom/integration-tests/testapp/build.gradle b/core/core-telecom/integration-tests/testapp/build.gradle
index 9f08357..c405215 100644
--- a/core/core-telecom/integration-tests/testapp/build.gradle
+++ b/core/core-telecom/integration-tests/testapp/build.gradle
@@ -21,21 +21,20 @@
 }
 
 android {
-    namespace 'androidx.core.telecom.test'
+    namespace = "androidx.core.telecom.test"
 
     defaultConfig {
-        applicationId "androidx.core.telecom.test"
-        minSdk 21
+        applicationId = "androidx.core.telecom.test"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 }
 
diff --git a/core/core-telecom/integration-tests/testicsapp/build.gradle b/core/core-telecom/integration-tests/testicsapp/build.gradle
index b8b9fdc..c3ce464 100644
--- a/core/core-telecom/integration-tests/testicsapp/build.gradle
+++ b/core/core-telecom/integration-tests/testicsapp/build.gradle
@@ -22,22 +22,22 @@
 }
 
 android {
-    namespace 'androidx.core.telecom.test'
+    namespace = "androidx.core.telecom.test"
 
     defaultConfig {
-        applicationId "androidx.core.telecom.icstest"
-        minSdk 29 // Move down to 23 if we support CallingApp:checkDialerRole for < Q
+        applicationId = "androidx.core.telecom.icstest"
+        minSdk = 29 // Move down to 23 if we support CallingApp:checkDialerRole for < Q
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 }
 
diff --git a/core/core-testing/build.gradle b/core/core-testing/build.gradle
index ca6f2e3..28260be 100644
--- a/core/core-testing/build.gradle
+++ b/core/core-testing/build.gradle
@@ -44,8 +44,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.core.testing"
+    compileSdk = 35
+    namespace = "androidx.core.testing"
 }
 
 androidx {
diff --git a/core/core-viewtree/build.gradle b/core/core-viewtree/build.gradle
index 45281e8..2705d97 100644
--- a/core/core-viewtree/build.gradle
+++ b/core/core-viewtree/build.gradle
@@ -42,7 +42,7 @@
 }
 
 android {
-    namespace "androidx.core.viewtree"
+    namespace = "androidx.core.viewtree"
 }
 
 androidx {
diff --git a/core/core/build.gradle b/core/core/build.gradle
index 46f02ff..5263fa8 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -79,13 +79,13 @@
     }
     testOptions.unitTests.includeAndroidResources = true
     aaptOptions {
-        noCompress "ttf"
+        noCompress = "ttf"
     }
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
 
         stableAidl {
-            version 1
+            version = 1
         }
     }
 
@@ -96,7 +96,7 @@
                 "mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider"
         ]
     }
-    namespace "androidx.core"
+    namespace = "androidx.core"
 }
 
 androidx {
diff --git a/core/core/samples/build.gradle b/core/core/samples/build.gradle
index 0d008cd..706b1ef 100644
--- a/core/core/samples/build.gradle
+++ b/core/core/samples/build.gradle
@@ -24,8 +24,8 @@
     implementation(project(":core:core"))
 }
 android {
-    compileSdk 35
-    namespace "androidx.core.samples"
+    compileSdk = 35
+    namespace = "androidx.core.samples"
 }
 androidx {
     name = "AndroidX Core Samples"
diff --git a/core/haptics/haptics/build.gradle b/core/haptics/haptics/build.gradle
index 5d5ca3c..ff4325a 100644
--- a/core/haptics/haptics/build.gradle
+++ b/core/haptics/haptics/build.gradle
@@ -43,8 +43,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.core.haptics"
+    compileSdk = 35
+    namespace = "androidx.core.haptics"
 }
 
 androidx {
diff --git a/core/haptics/haptics/integration-tests/demos/build.gradle b/core/haptics/haptics/integration-tests/demos/build.gradle
index d4f87ae..d6dd644 100644
--- a/core/haptics/haptics/integration-tests/demos/build.gradle
+++ b/core/haptics/haptics/integration-tests/demos/build.gradle
@@ -28,9 +28,9 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.core.haptics.demos"
+        applicationId = "androidx.core.haptics.demos"
     }
-    namespace "androidx.core.haptics.demos"
+    namespace = "androidx.core.haptics.demos"
 }
diff --git a/core/haptics/haptics/samples/build.gradle b/core/haptics/haptics/samples/build.gradle
index 3892ef1..cd30936 100644
--- a/core/haptics/haptics/samples/build.gradle
+++ b/core/haptics/haptics/samples/build.gradle
@@ -25,8 +25,8 @@
     implementation(project(":core:haptics:haptics"))
 }
 android {
-    compileSdk 35
-    namespace "androidx.core.haptics.samples"
+    compileSdk = 35
+    namespace = "androidx.core.haptics.samples"
 }
 androidx {
     name = "AndroidX Core Haptics Samples"
diff --git a/core/uwb/uwb-rxjava3/build.gradle b/core/uwb/uwb-rxjava3/build.gradle
index d85550e..f41a91e 100644
--- a/core/uwb/uwb-rxjava3/build.gradle
+++ b/core/uwb/uwb-rxjava3/build.gradle
@@ -50,10 +50,10 @@
 
 android {
     defaultConfig {
-        minSdkVersion 31
+        minSdk = 31
     }
 
-    namespace "androidx.core.uwb.rxjava3"
+    namespace = "androidx.core.uwb.rxjava3"
 }
 
 androidx {
diff --git a/core/uwb/uwb/build.gradle b/core/uwb/uwb/build.gradle
index 69aa5d0..d4a2b31 100644
--- a/core/uwb/uwb/build.gradle
+++ b/core/uwb/uwb/build.gradle
@@ -59,16 +59,16 @@
 }
 
 android {
-    namespace "androidx.core.uwb"
+    namespace = "androidx.core.uwb"
     buildFeatures {
         aidl = true
     }
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
 }
diff --git a/credentials/credentials-e2ee/build.gradle b/credentials/credentials-e2ee/build.gradle
index 4216c7a..dcc945c 100644
--- a/credentials/credentials-e2ee/build.gradle
+++ b/credentials/credentials-e2ee/build.gradle
@@ -34,7 +34,7 @@
 }
 
 android {
-    namespace "androidx.credentials.e2ee"
+    namespace = "androidx.credentials.e2ee"
 }
 
 androidx {
diff --git a/credentials/credentials-fido/build.gradle b/credentials/credentials-fido/build.gradle
index 89b1cd52e..e8f1534 100644
--- a/credentials/credentials-fido/build.gradle
+++ b/credentials/credentials-fido/build.gradle
@@ -46,8 +46,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.credentials.fido"
+    compileSdk = 35
+    namespace = "androidx.credentials.fido"
 }
 
 androidx {
diff --git a/credentials/credentials-play-services-auth/build.gradle b/credentials/credentials-play-services-auth/build.gradle
index 63d01b8..9fd1bde 100644
--- a/credentials/credentials-play-services-auth/build.gradle
+++ b/credentials/credentials-play-services-auth/build.gradle
@@ -75,8 +75,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.credentials.play.services.auth"
+    compileSdk = 35
+    namespace = "androidx.credentials.play.services.auth"
 
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
diff --git a/credentials/credentials-play-services-e2ee/build.gradle b/credentials/credentials-play-services-e2ee/build.gradle
index a8359e8..9581f70 100644
--- a/credentials/credentials-play-services-e2ee/build.gradle
+++ b/credentials/credentials-play-services-e2ee/build.gradle
@@ -29,7 +29,7 @@
     androidTestImplementation(libs.truth)
 }
 android {
-    namespace "androidx.credentials.playservices.e2ee"
+    namespace = "androidx.credentials.playservices.e2ee"
 }
 androidx {
     name = "androidx.credentials:credentials.playservices.e2ee"
diff --git a/credentials/credentials-provider/build.gradle b/credentials/credentials-provider/build.gradle
index 2fc475a..0711936 100644
--- a/credentials/credentials-provider/build.gradle
+++ b/credentials/credentials-provider/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    namespace "androidx.credentials.provider"
+    namespace = "androidx.credentials.provider"
 
     defaultConfig {
     }
diff --git a/credentials/credentials/build.gradle b/credentials/credentials/build.gradle
index 746c201..887ded0 100644
--- a/credentials/credentials/build.gradle
+++ b/credentials/credentials/build.gradle
@@ -52,7 +52,7 @@
 
 android {
     compileSdk = 35
-    namespace "androidx.credentials"
+    namespace = "androidx.credentials"
 
     defaultConfig {
     }
diff --git a/credentials/credentials/samples/build.gradle b/credentials/credentials/samples/build.gradle
index fa9238c..fb81e3a 100644
--- a/credentials/credentials/samples/build.gradle
+++ b/credentials/credentials/samples/build.gradle
@@ -30,8 +30,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.credentials.samples"
+    compileSdk = 35
+    namespace = "androidx.credentials.samples"
 
     defaultConfig {
     }
diff --git a/credentials/registry/registry-digitalcredentials-mdoc/build.gradle b/credentials/registry/registry-digitalcredentials-mdoc/build.gradle
index 0acb81a..9ca8052 100644
--- a/credentials/registry/registry-digitalcredentials-mdoc/build.gradle
+++ b/credentials/registry/registry-digitalcredentials-mdoc/build.gradle
@@ -42,7 +42,7 @@
 
 android {
     compileSdk = 35
-    namespace "androidx.credentials.registry.digitalcredentials.mdoc"
+    namespace = "androidx.credentials.registry.digitalcredentials.mdoc"
 }
 
 androidx {
diff --git a/credentials/registry/registry-digitalcredentials-preview/build.gradle b/credentials/registry/registry-digitalcredentials-preview/build.gradle
index 544bc20..4381874 100644
--- a/credentials/registry/registry-digitalcredentials-preview/build.gradle
+++ b/credentials/registry/registry-digitalcredentials-preview/build.gradle
@@ -43,7 +43,7 @@
 
 android {
     compileSdk = 35
-    namespace "androidx.credentials.registry.digitalcredentials.preview"
+    namespace = "androidx.credentials.registry.digitalcredentials.preview"
 }
 
 androidx {
diff --git a/credentials/registry/registry-provider-play-services/build.gradle b/credentials/registry/registry-provider-play-services/build.gradle
index c1ea920..4e5a0f4 100644
--- a/credentials/registry/registry-provider-play-services/build.gradle
+++ b/credentials/registry/registry-provider-play-services/build.gradle
@@ -52,7 +52,7 @@
 
 android {
     compileSdk = 35
-    namespace "androidx.credentials.registry.provider.playservices"
+    namespace = "androidx.credentials.registry.provider.playservices"
 
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
diff --git a/credentials/registry/registry-provider/build.gradle b/credentials/registry/registry-provider/build.gradle
index d936ecc..2796a7b 100644
--- a/credentials/registry/registry-provider/build.gradle
+++ b/credentials/registry/registry-provider/build.gradle
@@ -46,7 +46,7 @@
 
 android {
     compileSdk = 35
-    namespace "androidx.credentials.registry.provider"
+    namespace = "androidx.credentials.registry.provider"
 }
 
 androidx {
diff --git a/cursoradapter/cursoradapter/build.gradle b/cursoradapter/cursoradapter/build.gradle
index b3562cf..ece234c 100644
--- a/cursoradapter/cursoradapter/build.gradle
+++ b/cursoradapter/cursoradapter/build.gradle
@@ -25,5 +25,5 @@
 }
 
 android {
-    namespace "androidx.cursoradapter"
+    namespace = "androidx.cursoradapter"
 }
diff --git a/customview/customview-poolingcontainer/build.gradle b/customview/customview-poolingcontainer/build.gradle
index 65371f4..1c92e1e 100644
--- a/customview/customview-poolingcontainer/build.gradle
+++ b/customview/customview-poolingcontainer/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.customview.poolingcontainer"
+    namespace = "androidx.customview.poolingcontainer"
 }
diff --git a/customview/customview/build.gradle b/customview/customview/build.gradle
index 8d8fc8a..e02a965 100644
--- a/customview/customview/build.gradle
+++ b/customview/customview/build.gradle
@@ -36,5 +36,5 @@
 }
 
 android {
-    namespace "androidx.customview"
+    namespace = "androidx.customview"
 }
diff --git a/datastore/datastore-benchmark/build.gradle b/datastore/datastore-benchmark/build.gradle
index 3fdc300..f58443f 100644
--- a/datastore/datastore-benchmark/build.gradle
+++ b/datastore/datastore-benchmark/build.gradle
@@ -46,5 +46,5 @@
 }
 
 android {
-    namespace "androidx.datastore.benchmark"
+    namespace = "androidx.datastore.benchmark"
 }
diff --git a/datastore/datastore-compose-samples/build.gradle b/datastore/datastore-compose-samples/build.gradle
index f60d8c9..96059af 100644
--- a/datastore/datastore-compose-samples/build.gradle
+++ b/datastore/datastore-compose-samples/build.gradle
@@ -54,9 +54,9 @@
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
 }
 android {
-    compileSdk 35
-    namespace 'com.example.datastorecomposesamples'
+    compileSdk = 35
+    namespace = "com.example.datastorecomposesamples"
     defaultConfig {
-        minSdk 28
+        minSdk = 28
     }
 }
diff --git a/datastore/datastore-core/build.gradle b/datastore/datastore-core/build.gradle
index 6e0c502..1f4ea77 100644
--- a/datastore/datastore-core/build.gradle
+++ b/datastore/datastore-core/build.gradle
@@ -36,10 +36,10 @@
     externalNativeBuild {
         cmake {
             path "src/androidMain/cpp/CMakeLists.txt"
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
         }
     }
-    namespace "androidx.datastore.core"
+    namespace = "androidx.datastore.core"
 }
 
 androidXMultiplatform {
diff --git a/datastore/datastore-guava/build.gradle b/datastore/datastore-guava/build.gradle
index e82a88b..fd651f8 100644
--- a/datastore/datastore-guava/build.gradle
+++ b/datastore/datastore-guava/build.gradle
@@ -31,7 +31,7 @@
 }
 
 android {
-    namespace "androidx.datastore.guava"
+    namespace = "androidx.datastore.guava"
 }
 
 dependencies {
diff --git a/datastore/datastore-preferences-rxjava2/build.gradle b/datastore/datastore-preferences-rxjava2/build.gradle
index 101ab24..02ad5cb 100644
--- a/datastore/datastore-preferences-rxjava2/build.gradle
+++ b/datastore/datastore-preferences-rxjava2/build.gradle
@@ -36,7 +36,7 @@
         test.java.srcDirs += "src/test-common/java"
         androidTest.java.srcDirs += "src/test-common/java"
     }
-    namespace "androidx.datastore.preferences.rxjava2"
+    namespace = "androidx.datastore.preferences.rxjava2"
 }
 
 dependencies {
diff --git a/datastore/datastore-preferences-rxjava3/build.gradle b/datastore/datastore-preferences-rxjava3/build.gradle
index b57fa46..4aafabd 100644
--- a/datastore/datastore-preferences-rxjava3/build.gradle
+++ b/datastore/datastore-preferences-rxjava3/build.gradle
@@ -36,7 +36,7 @@
         test.java.srcDirs += "src/test-common/java"
         androidTest.java.srcDirs += "src/test-common/java"
     }
-    namespace "androidx.datastore.preferences.rxjava3"
+    namespace = "androidx.datastore.preferences.rxjava3"
 }
 
 dependencies {
diff --git a/datastore/datastore-proto/build.gradle b/datastore/datastore-proto/build.gradle
index a7f7e1b..5d3c927 100644
--- a/datastore/datastore-proto/build.gradle
+++ b/datastore/datastore-proto/build.gradle
@@ -41,5 +41,5 @@
     testImplementation(libs.kotlinCoroutinesTest)
 }
 android {
-    namespace "androidx.datastore.protodatastore"
+    namespace = "androidx.datastore.protodatastore"
 }
diff --git a/datastore/datastore-rxjava2/build.gradle b/datastore/datastore-rxjava2/build.gradle
index a89c658f..caebdbf 100644
--- a/datastore/datastore-rxjava2/build.gradle
+++ b/datastore/datastore-rxjava2/build.gradle
@@ -36,7 +36,7 @@
         test.java.srcDirs += "src/test-common/java"
         androidTest.java.srcDirs += "src/test-common/java"
     }
-    namespace "androidx.datastore.rxjava2"
+    namespace = "androidx.datastore.rxjava2"
 }
 
 dependencies {
diff --git a/datastore/datastore-rxjava3/build.gradle b/datastore/datastore-rxjava3/build.gradle
index 4c9df49..f56fcab 100644
--- a/datastore/datastore-rxjava3/build.gradle
+++ b/datastore/datastore-rxjava3/build.gradle
@@ -36,7 +36,7 @@
         test.java.srcDirs += "src/test-common/java"
         androidTest.java.srcDirs += "src/test-common/java"
     }
-    namespace "androidx.datastore.rxjava3"
+    namespace = "androidx.datastore.rxjava3"
 }
 
 dependencies {
diff --git a/datastore/datastore-sampleapp/build.gradle b/datastore/datastore-sampleapp/build.gradle
index 06bd784..b3e5bc0 100644
--- a/datastore/datastore-sampleapp/build.gradle
+++ b/datastore/datastore-sampleapp/build.gradle
@@ -54,6 +54,6 @@
 }
 
 android {
-    namespace "com.example.datastoresampleapp"
+    namespace = "com.example.datastoresampleapp"
 }
 
diff --git a/datastore/integration-tests/testapp/build.gradle b/datastore/integration-tests/testapp/build.gradle
index a2111dd..66b95ab 100644
--- a/datastore/integration-tests/testapp/build.gradle
+++ b/datastore/integration-tests/testapp/build.gradle
@@ -23,7 +23,7 @@
 }
 
 android {
-    namespace "androidx.datastore.testapp"
+    namespace = "androidx.datastore.testapp"
 }
 
 dependencies {
diff --git a/development/project-creator/java-template/groupId/artifactId/build.gradle b/development/project-creator/java-template/groupId/artifactId/build.gradle
index 8ea8a3a..bef390b 100644
--- a/development/project-creator/java-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/java-template/groupId/artifactId/build.gradle
@@ -34,7 +34,7 @@
 }
 
 android {
-    namespace "<PACKAGE>"
+    namespace = "<PACKAGE>"
 }
 
 androidx {
diff --git a/development/project-creator/kotlin-template/groupId/artifactId/build.gradle b/development/project-creator/kotlin-template/groupId/artifactId/build.gradle
index 2b85968..5043663 100644
--- a/development/project-creator/kotlin-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/kotlin-template/groupId/artifactId/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    namespace "<PACKAGE>"
+    namespace = "<PACKAGE>"
 }
 
 androidx {
diff --git a/development/project-creator/native-template/groupId/artifactId/build.gradle b/development/project-creator/native-template/groupId/artifactId/build.gradle
index 69b0a95..0723b01 100644
--- a/development/project-creator/native-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/native-template/groupId/artifactId/build.gradle
@@ -43,7 +43,7 @@
 }
 
 android {
-    namespace "<PACKAGE>"
+    namespace = "<PACKAGE>"
     defaultConfig {
         externalNativeBuild {
             cmake {
@@ -54,7 +54,7 @@
     }
     externalNativeBuild {
         cmake {
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
             path "src/main/cpp/CMakeLists.txt"
         }
     }
diff --git a/docs-public/build.gradle b/docs-public/build.gradle
index 2748c15..cd8893f 100644
--- a/docs-public/build.gradle
+++ b/docs-public/build.gradle
@@ -11,7 +11,7 @@
 }
 
 android {
-    namespace "androidx.docs.publicdocs"
+    namespace = "androidx.docs.publicdocs"
 }
 
 dependencies {
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 13aaa2c..b017ef3 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -13,7 +13,7 @@
 }
 
 android {
-    namespace "androidx.docs.tipoftree"
+    namespace = "androidx.docs.tipoftree"
 }
 
 // The dependency list should only be changed when a new project is registered or a project's source is removed. Samples should never be added.
diff --git a/documentfile/documentfile/build.gradle b/documentfile/documentfile/build.gradle
index 77a3a17..4d63700 100644
--- a/documentfile/documentfile/build.gradle
+++ b/documentfile/documentfile/build.gradle
@@ -32,5 +32,5 @@
 }
 
 android {
-    namespace "androidx.documentfile"
+    namespace = "androidx.documentfile"
 }
diff --git a/draganddrop/draganddrop/build.gradle b/draganddrop/draganddrop/build.gradle
index 089c9e8..d1e6702 100644
--- a/draganddrop/draganddrop/build.gradle
+++ b/draganddrop/draganddrop/build.gradle
@@ -43,10 +43,10 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.draganddrop"
+    namespace = "androidx.draganddrop"
 }
 
 androidx {
diff --git a/draganddrop/integration-tests/sampleapp/build.gradle b/draganddrop/integration-tests/sampleapp/build.gradle
index 526aaeb9..630ed88 100644
--- a/draganddrop/integration-tests/sampleapp/build.gradle
+++ b/draganddrop/integration-tests/sampleapp/build.gradle
@@ -26,7 +26,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
-    namespace "androidx.draganddrop.sampleapp"
+    namespace = "androidx.draganddrop.sampleapp"
 }
diff --git a/drawerlayout/drawerlayout/build.gradle b/drawerlayout/drawerlayout/build.gradle
index 80fa72e..402e65c 100644
--- a/drawerlayout/drawerlayout/build.gradle
+++ b/drawerlayout/drawerlayout/build.gradle
@@ -36,5 +36,5 @@
 }
 
 android {
-    namespace "androidx.drawerlayout"
+    namespace = "androidx.drawerlayout"
 }
diff --git a/dynamicanimation/dynamicanimation-ktx/build.gradle b/dynamicanimation/dynamicanimation-ktx/build.gradle
index 654251f..58f769b 100644
--- a/dynamicanimation/dynamicanimation-ktx/build.gradle
+++ b/dynamicanimation/dynamicanimation-ktx/build.gradle
@@ -53,5 +53,5 @@
 }
 
 android {
-    namespace "androidx.dynamicanimation.ktx"
+    namespace = "androidx.dynamicanimation.ktx"
 }
diff --git a/dynamicanimation/dynamicanimation/build.gradle b/dynamicanimation/dynamicanimation/build.gradle
index 019c8ed..32b31e8 100644
--- a/dynamicanimation/dynamicanimation/build.gradle
+++ b/dynamicanimation/dynamicanimation/build.gradle
@@ -35,5 +35,5 @@
 }
 
 android {
-    namespace "androidx.dynamicanimation"
+    namespace = "androidx.dynamicanimation"
 }
diff --git a/emoji/emoji-appcompat/build.gradle b/emoji/emoji-appcompat/build.gradle
index cc3ee69..4da0ba1 100644
--- a/emoji/emoji-appcompat/build.gradle
+++ b/emoji/emoji-appcompat/build.gradle
@@ -43,5 +43,5 @@
 }
 
 android {
-    namespace "androidx.emoji.appcompat"
+    namespace = "androidx.emoji.appcompat"
 }
diff --git a/emoji/emoji-bundled/build.gradle b/emoji/emoji-bundled/build.gradle
index cf8e119..c7d60da 100644
--- a/emoji/emoji-bundled/build.gradle
+++ b/emoji/emoji-bundled/build.gradle
@@ -20,7 +20,7 @@
     sourceSets {
         main.assets.srcDirs new File(fontDir, "font").getAbsolutePath()
     }
-    namespace "androidx.emoji.bundled"
+    namespace = "androidx.emoji.bundled"
 }
 
 dependencies {
diff --git a/emoji/emoji/build.gradle b/emoji/emoji/build.gradle
index f6b2e75..ef08527 100644
--- a/emoji/emoji/build.gradle
+++ b/emoji/emoji/build.gradle
@@ -58,7 +58,7 @@
             }
         }
     }
-    namespace "androidx.emoji"
+    namespace = "androidx.emoji"
 }
 
 androidx {
diff --git a/emoji2/emoji2-benchmark/build.gradle b/emoji2/emoji2-benchmark/build.gradle
index 3af6c4a..7d286cc 100644
--- a/emoji2/emoji2-benchmark/build.gradle
+++ b/emoji2/emoji2-benchmark/build.gradle
@@ -42,7 +42,7 @@
             }
         }
     }
-    namespace "androidx.emoji2.benchmark"
+    namespace = "androidx.emoji2.benchmark"
 
 }
 
diff --git a/emoji2/emoji2-bundled/build.gradle b/emoji2/emoji2-bundled/build.gradle
index cd7870b..6fde27a 100644
--- a/emoji2/emoji2-bundled/build.gradle
+++ b/emoji2/emoji2-bundled/build.gradle
@@ -32,7 +32,7 @@
             }
         }
     }
-    namespace "androidx.emoji2.bundled"
+    namespace = "androidx.emoji2.bundled"
 
 }
 
diff --git a/emoji2/emoji2-emojipicker/build.gradle b/emoji2/emoji2-emojipicker/build.gradle
index 3dc62ec..bdead6a 100644
--- a/emoji2/emoji2-emojipicker/build.gradle
+++ b/emoji2/emoji2-emojipicker/build.gradle
@@ -58,7 +58,7 @@
         androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/emoji2/emoji2-emojipicker"
     }
 
-    namespace "androidx.emoji2.emojipicker"
+    namespace = "androidx.emoji2.emojipicker"
     testOptions.unitTests.includeAndroidResources = true
 }
 
diff --git a/emoji2/emoji2-emojipicker/samples/build.gradle b/emoji2/emoji2-emojipicker/samples/build.gradle
index 3af2482..9236d00 100644
--- a/emoji2/emoji2-emojipicker/samples/build.gradle
+++ b/emoji2/emoji2-emojipicker/samples/build.gradle
@@ -34,8 +34,8 @@
     implementation(project(":compose:foundation:foundation"))
 }
 android {
-    compileSdk 35
-    namespace "androidx.emoji2.emojipicker.samples"
+    compileSdk = 35
+    namespace = "androidx.emoji2.emojipicker.samples"
 }
 
 androidx {
diff --git a/emoji2/emoji2-views-helper/build.gradle b/emoji2/emoji2-views-helper/build.gradle
index 257a584..0337e03 100644
--- a/emoji2/emoji2-views-helper/build.gradle
+++ b/emoji2/emoji2-views-helper/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    namespace "androidx.emoji2.viewsintegration"
+    namespace = "androidx.emoji2.viewsintegration"
 }
 
 androidx {
diff --git a/emoji2/emoji2-views/build.gradle b/emoji2/emoji2-views/build.gradle
index f62ddd3..ead2f3e 100644
--- a/emoji2/emoji2-views/build.gradle
+++ b/emoji2/emoji2-views/build.gradle
@@ -36,7 +36,7 @@
             res.srcDirs += 'src/main/res-public'
         }
     }
-    namespace "androidx.emoji2.widget"
+    namespace = "androidx.emoji2.widget"
 }
 
 androidx {
diff --git a/emoji2/emoji2/build.gradle b/emoji2/emoji2/build.gradle
index 6b37113..e52b382 100644
--- a/emoji2/emoji2/build.gradle
+++ b/emoji2/emoji2/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.emoji2"
+    namespace = "androidx.emoji2"
 }
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle b/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle
index 0eda6405..7e27a7a 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle
+++ b/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle
@@ -21,15 +21,15 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    namespace "androidx.emoji2.integration.macrobenchmark.disabled.target"
+    namespace = "androidx.emoji2.integration.macrobenchmark.disabled.target"
 }
 
 dependencies {
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle b/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle
index 4a65042..e9c60e1 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle
+++ b/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.emoji2.integration.macrobenchmark.disabled"
+    namespace = "androidx.emoji2.integration.macrobenchmark.disabled"
     targetProjectPath = ":emoji2:integration-tests:init-disabled-macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle b/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle
index 66b2b6c..376173e 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle
+++ b/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle
@@ -21,15 +21,15 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    namespace "androidx.emoji2.integration.macrobenchmark.enabled.target"
+    namespace = "androidx.emoji2.integration.macrobenchmark.enabled.target"
 }
 
 dependencies {
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle b/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle
index c1f5ed9..c608fee 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle
+++ b/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.emoji2.integration.macrobenchmark.enabled"
+    namespace = "androidx.emoji2.integration.macrobenchmark.enabled"
     targetProjectPath = ":emoji2:integration-tests:init-enabled-macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/enterprise/enterprise-feedback-testing/build.gradle b/enterprise/enterprise-feedback-testing/build.gradle
index 8769718..04acd62 100644
--- a/enterprise/enterprise-feedback-testing/build.gradle
+++ b/enterprise/enterprise-feedback-testing/build.gradle
@@ -33,7 +33,7 @@
 }
 android {
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.enterprise.feedback.testing"
+    namespace = "androidx.enterprise.feedback.testing"
 }
 androidx {
     name = "Enterprise Feedback Testing"
diff --git a/enterprise/enterprise-feedback/build.gradle b/enterprise/enterprise-feedback/build.gradle
index 2819247..c617fe8 100644
--- a/enterprise/enterprise-feedback/build.gradle
+++ b/enterprise/enterprise-feedback/build.gradle
@@ -23,7 +23,7 @@
 }
 android {
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.enterprise.feedback"
+    namespace = "androidx.enterprise.feedback"
 }
 
 androidx {
diff --git a/exifinterface/exifinterface/build.gradle b/exifinterface/exifinterface/build.gradle
index ae4efc4..17c36a6 100644
--- a/exifinterface/exifinterface/build.gradle
+++ b/exifinterface/exifinterface/build.gradle
@@ -31,5 +31,5 @@
 }
 
 android {
-    namespace "androidx.exifinterface"
+    namespace = "androidx.exifinterface"
 }
diff --git a/external/libyuv/build.gradle b/external/libyuv/build.gradle
index f1b7014..45640f2 100644
--- a/external/libyuv/build.gradle
+++ b/external/libyuv/build.gradle
@@ -45,25 +45,25 @@
 
     externalNativeBuild {
         cmake {
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
             path "${yuvSourceDir}/CMakeLists.txt"
         }
     }
 
     // Enable generation of Prefab packages and include them in the library's AAR.
     buildFeatures {
-        prefabPublishing true
+        prefabPublishing = true
     }
 
     // Include the "libyuv" module from the native build system in the AAR,
     // and export the headers in include to its consumers
     prefab {
         libyuv {
-            headers "${yuvSourceDir}/include"
-            name "yuv"
+            headers = "${yuvSourceDir}/include"
+            name = "yuv"
         }
     }
-    namespace "com.google.libyuv"
+    namespace = "com.google.libyuv"
 }
 
 androidx {
diff --git a/fragment/fragment-compose/build.gradle b/fragment/fragment-compose/build.gradle
index 6292ad1..d776d8e 100644
--- a/fragment/fragment-compose/build.gradle
+++ b/fragment/fragment-compose/build.gradle
@@ -64,8 +64,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.fragment.compose"
+    compileSdk = 35
+    namespace = "androidx.fragment.compose"
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/fragment/fragment-compose/samples/build.gradle b/fragment/fragment-compose/samples/build.gradle
index 9266e64..230abd6 100644
--- a/fragment/fragment-compose/samples/build.gradle
+++ b/fragment/fragment-compose/samples/build.gradle
@@ -43,6 +43,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.fragment.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.fragment.compose.samples"
 }
diff --git a/fragment/fragment-ktx/build.gradle b/fragment/fragment-ktx/build.gradle
index be12fc8..05c0ffb 100644
--- a/fragment/fragment-ktx/build.gradle
+++ b/fragment/fragment-ktx/build.gradle
@@ -61,5 +61,5 @@
 }
 
 android {
-    namespace "androidx.fragment.ktx"
+    namespace = "androidx.fragment.ktx"
 }
diff --git a/fragment/fragment-testing-manifest/build.gradle b/fragment/fragment-testing-manifest/build.gradle
index 94663cb..88d1afd 100644
--- a/fragment/fragment-testing-manifest/build.gradle
+++ b/fragment/fragment-testing-manifest/build.gradle
@@ -50,7 +50,7 @@
 }
 
 android {
-    namespace "androidx.fragment.testing.manifest"
+    namespace = "androidx.fragment.testing.manifest"
 }
 
 tasks.withType(KotlinCompile).configureEach {
diff --git a/fragment/fragment-testing/build.gradle b/fragment/fragment-testing/build.gradle
index ffe37d0..e46e85e 100644
--- a/fragment/fragment-testing/build.gradle
+++ b/fragment/fragment-testing/build.gradle
@@ -62,5 +62,5 @@
 }
 
 android {
-    namespace "androidx.fragment.testing"
+    namespace = "androidx.fragment.testing"
 }
diff --git a/fragment/fragment-truth/build.gradle b/fragment/fragment-truth/build.gradle
index ea47b74..6b158d9 100644
--- a/fragment/fragment-truth/build.gradle
+++ b/fragment/fragment-truth/build.gradle
@@ -49,5 +49,5 @@
 }
 
 android {
-    namespace "androidx.fragment.truth"
+    namespace = "androidx.fragment.truth"
 }
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index 65f3aeb..d52b52e 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -25,7 +25,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.fragment"
+    namespace = "androidx.fragment"
 }
 
 dependencies {
diff --git a/fragment/integration-tests/testapp/build.gradle b/fragment/integration-tests/testapp/build.gradle
index 42604a1..5ebdca6 100644
--- a/fragment/integration-tests/testapp/build.gradle
+++ b/fragment/integration-tests/testapp/build.gradle
@@ -21,8 +21,8 @@
 }
 
 android {
-    namespace "androidx.fragment.testapp"
-    compileSdk 35
+    namespace = "androidx.fragment.testapp"
+    compileSdk = 35
 }
 
 dependencies {
diff --git a/glance/glance-appwidget-multiprocess/build.gradle b/glance/glance-appwidget-multiprocess/build.gradle
index 72922dd..781423b 100644
--- a/glance/glance-appwidget-multiprocess/build.gradle
+++ b/glance/glance-appwidget-multiprocess/build.gradle
@@ -39,8 +39,8 @@
 }
 
 android {
-    namespace "androidx.glance.appwidget.multiprocess"
-    compileSdk 35
+    namespace = "androidx.glance.appwidget.multiprocess"
+    compileSdk = 35
 }
 
 androidx {
diff --git a/glance/glance-appwidget-preview/build.gradle b/glance/glance-appwidget-preview/build.gradle
index 7211a90..8619e6273 100644
--- a/glance/glance-appwidget-preview/build.gradle
+++ b/glance/glance-appwidget-preview/build.gradle
@@ -50,8 +50,8 @@
 }
 
 android {
-    namespace "androidx.glance.appwidget.preview"
-    compileSdk 35
+    namespace = "androidx.glance.appwidget.preview"
+    compileSdk = 35
 }
 
 androidx {
diff --git a/glance/glance-appwidget-testing/build.gradle b/glance/glance-appwidget-testing/build.gradle
index 8b6c34a..927d159 100644
--- a/glance/glance-appwidget-testing/build.gradle
+++ b/glance/glance-appwidget-testing/build.gradle
@@ -55,10 +55,10 @@
     }
 
     defaultConfig {
-        minSdkVersion 23
-        compileSdk 35
+        minSdk = 23
+        compileSdk = 35
     }
-    namespace "androidx.glance.appwidget.testing"
+    namespace = "androidx.glance.appwidget.testing"
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+ in glance-appwidget
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/glance/glance-appwidget-testing/samples/build.gradle b/glance/glance-appwidget-testing/samples/build.gradle
index 8e24f74..ca18f93 100644
--- a/glance/glance-appwidget-testing/samples/build.gradle
+++ b/glance/glance-appwidget-testing/samples/build.gradle
@@ -53,8 +53,8 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
-        compileSdk 35
+        minSdk = 23
+        compileSdk = 35
     }
-    namespace "androidx.glance.appwidget.testing.samples"
+    namespace = "androidx.glance.appwidget.testing.samples"
 }
diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle
index e923fdb..ad5a36c 100644
--- a/glance/glance-appwidget/build.gradle
+++ b/glance/glance-appwidget/build.gradle
@@ -95,18 +95,18 @@
 
     buildTypes {
         debug {
-            pseudoLocalesEnabled true
+            pseudoLocalesEnabled = true
         }
     }
-    namespace "androidx.glance.appwidget"
+    namespace = "androidx.glance.appwidget"
 
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
     }
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+
     experimentalProperties["android.lint.useK2Uast"] = false
 
-    compileSdk 35
+    compileSdk = 35
 }
 
 androidx {
diff --git a/glance/glance-appwidget/integration-tests/demos/build.gradle b/glance/glance-appwidget/integration-tests/demos/build.gradle
index 842fa90..ce9aeb1 100644
--- a/glance/glance-appwidget/integration-tests/demos/build.gradle
+++ b/glance/glance-appwidget/integration-tests/demos/build.gradle
@@ -41,8 +41,8 @@
 }
 
 android {
-    namespace "androidx.glance.appwidget.demos"
+    namespace = "androidx.glance.appwidget.demos"
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+ in glance-appwidget
     experimentalProperties["android.lint.useK2Uast"] = false
-    compileSdk 35
+    compileSdk = 35
 }
diff --git a/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle b/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle
index 3c839b8..f52c630 100644
--- a/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle
+++ b/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle
@@ -29,12 +29,12 @@
 }
 
 android {
-    namespace "androidx.glance.appwidget.macrobenchmark.target"
-    compileSdk 35
+    namespace = "androidx.glance.appwidget.macrobenchmark.target"
+    compileSdk = 35
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),
                     'proguard-rules.pro'
         }
diff --git a/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle b/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle
index 3705bec..05aca13 100644
--- a/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle
+++ b/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle
@@ -22,10 +22,10 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
-        compileSdk 35
+        minSdk = 23
+        compileSdk = 35
     }
-    namespace "androidx.glance.appwidget.macrobenchmark"
+    namespace = "androidx.glance.appwidget.macrobenchmark"
     targetProjectPath = ":glance:glance-appwidget:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/glance/glance-appwidget/samples/build.gradle b/glance/glance-appwidget/samples/build.gradle
index 15791e6..ae39ced 100644
--- a/glance/glance-appwidget/samples/build.gradle
+++ b/glance/glance-appwidget/samples/build.gradle
@@ -51,6 +51,6 @@
 }
 
 android {
-    namespace "androidx.glance.appwidget.samples"
-    compileSdk 35
+    namespace = "androidx.glance.appwidget.samples"
+    compileSdk = 35
 }
diff --git a/glance/glance-material/build.gradle b/glance/glance-material/build.gradle
index 0d8fd1e..023a848 100644
--- a/glance/glance-material/build.gradle
+++ b/glance/glance-material/build.gradle
@@ -23,7 +23,7 @@
 }
 
 android {
-    namespace "androidx.glance.material"
+    namespace = "androidx.glance.material"
 }
 
 androidx {
diff --git a/glance/glance-material3/build.gradle b/glance/glance-material3/build.gradle
index 821e95e..3a490a7 100644
--- a/glance/glance-material3/build.gradle
+++ b/glance/glance-material3/build.gradle
@@ -24,7 +24,7 @@
 }
 
 android {
-    namespace "androidx.glance.material3"
+    namespace = "androidx.glance.material3"
 }
 
 androidx {
diff --git a/glance/glance-preview/build.gradle b/glance/glance-preview/build.gradle
index 9126227..0cbf6fd 100644
--- a/glance/glance-preview/build.gradle
+++ b/glance/glance-preview/build.gradle
@@ -21,7 +21,7 @@
 }
 
 android {
-    namespace "androidx.glance.preview"
+    namespace = "androidx.glance.preview"
 }
 
 androidx {
diff --git a/glance/glance-template/build.gradle b/glance/glance-template/build.gradle
index 90415bf..a0f7619 100644
--- a/glance/glance-template/build.gradle
+++ b/glance/glance-template/build.gradle
@@ -73,8 +73,8 @@
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
     resourcePrefix "glance_template_"
-    namespace "androidx.glance.template"
-    compileSdk 35
+    namespace = "androidx.glance.template"
+    compileSdk = 35
 }
 
 androidx {
diff --git a/glance/glance-template/integration-tests/template-demos/build.gradle b/glance/glance-template/integration-tests/template-demos/build.gradle
index 31359b9..00375b2 100644
--- a/glance/glance-template/integration-tests/template-demos/build.gradle
+++ b/glance/glance-template/integration-tests/template-demos/build.gradle
@@ -43,6 +43,6 @@
 }
 
 android {
-    namespace "androidx.glance.appwidget.template.demos"
-    compileSdk 35
+    namespace = "androidx.glance.appwidget.template.demos"
+    compileSdk = 35
 }
diff --git a/glance/glance-testing/build.gradle b/glance/glance-testing/build.gradle
index 9fec2dd..c6bf571 100644
--- a/glance/glance-testing/build.gradle
+++ b/glance/glance-testing/build.gradle
@@ -51,10 +51,10 @@
     }
 
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
 
-    namespace "androidx.glance.testing"
+    namespace = "androidx.glance.testing"
 }
 
 androidx {
diff --git a/glance/glance-wear-tiles/build.gradle b/glance/glance-wear-tiles/build.gradle
index e105490..da875d3 100644
--- a/glance/glance-wear-tiles/build.gradle
+++ b/glance/glance-wear-tiles/build.gradle
@@ -72,8 +72,8 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
-        compileSdk 35
+        minSdk = 26
+        compileSdk = 35
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
@@ -88,7 +88,7 @@
     sourceSets {
         androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/glance/glance-wear-tiles"
     }
-    namespace "androidx.glance.wear.tiles"
+    namespace = "androidx.glance.wear.tiles"
 
 }
 
diff --git a/glance/glance-wear-tiles/integration-tests/demos/build.gradle b/glance/glance-wear-tiles/integration-tests/demos/build.gradle
index dfb13e0..cf45d37 100644
--- a/glance/glance-wear-tiles/integration-tests/demos/build.gradle
+++ b/glance/glance-wear-tiles/integration-tests/demos/build.gradle
@@ -34,8 +34,8 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
-        compileSdk 35
+        minSdk = 26
+        compileSdk = 35
     }
-    namespace "androidx.glance.wear.tiles.demos"
+    namespace = "androidx.glance.wear.tiles.demos"
 }
diff --git a/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle b/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle
index 6c42393..ea82b88 100644
--- a/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle
+++ b/glance/glance-wear-tiles/integration-tests/template-demos/build.gradle
@@ -32,8 +32,8 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
-        compileSdk 35
+        minSdk = 26
+        compileSdk = 35
     }
-    namespace "androidx.glance.wear.tiles.template.demos"
+    namespace = "androidx.glance.wear.tiles.template.demos"
 }
diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle
index 7b40114..35eff8c 100644
--- a/glance/glance/build.gradle
+++ b/glance/glance/build.gradle
@@ -87,7 +87,7 @@
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
     resourcePrefix "glance_"
-    namespace "androidx.glance"
+    namespace = "androidx.glance"
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/graphics/filters/filters/build.gradle b/graphics/filters/filters/build.gradle
index a593ab0..997ee76 100644
--- a/graphics/filters/filters/build.gradle
+++ b/graphics/filters/filters/build.gradle
@@ -54,7 +54,7 @@
 }
 
 android {
-    namespace "androidx.graphics.filters"
+    namespace = "androidx.graphics.filters"
 }
 
 androidx {
diff --git a/graphics/graphics-core/build.gradle b/graphics/graphics-core/build.gradle
index f34f09c..efeb042 100644
--- a/graphics/graphics-core/build.gradle
+++ b/graphics/graphics-core/build.gradle
@@ -46,9 +46,8 @@
 }
 
 android {
-    compileSdk 35
-
-    namespace 'androidx.graphics.core'
+    compileSdk = 35
+    namespace = "androidx.graphics.core"
 
     defaultConfig {
         externalNativeBuild {
@@ -63,12 +62,12 @@
                                 "-Wl,--undefined-version"
             }
         }
-        consumerProguardFiles 'proguard-rules.pro'
+        consumerProguardFiles("proguard-rules.pro")
     }
     externalNativeBuild {
         cmake {
             path file('src/main/cpp/CMakeLists.txt')
-            version '3.22.1'
+            version = libs.versions.cmake.get()
         }
     }
 }
diff --git a/graphics/graphics-core/samples/build.gradle b/graphics/graphics-core/samples/build.gradle
index 991822a..c3edfbf 100644
--- a/graphics/graphics-core/samples/build.gradle
+++ b/graphics/graphics-core/samples/build.gradle
@@ -33,8 +33,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.graphics.core.samples"
+    compileSdk = 35
+    namespace = "androidx.graphics.core.samples"
 }
 
 androidx {
diff --git a/graphics/graphics-path/build.gradle b/graphics/graphics-path/build.gradle
index 70f190e..da2ad4c 100644
--- a/graphics/graphics-path/build.gradle
+++ b/graphics/graphics-path/build.gradle
@@ -45,7 +45,7 @@
 }
 
 android {
-    namespace "androidx.graphics.path"
+    namespace = "androidx.graphics.path"
 
     defaultConfig {
         externalNativeBuild {
@@ -77,7 +77,7 @@
     externalNativeBuild {
         cmake {
             path file('src/main/cpp/CMakeLists.txt')
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
         }
     }
 }
diff --git a/graphics/integration-tests/testapp-compose/build.gradle b/graphics/integration-tests/testapp-compose/build.gradle
index b7e5006..93a2c70 100644
--- a/graphics/integration-tests/testapp-compose/build.gradle
+++ b/graphics/integration-tests/testapp-compose/build.gradle
@@ -50,9 +50,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.graphics.shapes.testcompose"
+    namespace = "androidx.graphics.shapes.testcompose"
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/graphics/integration-tests/testapp/build.gradle b/graphics/integration-tests/testapp/build.gradle
index e45b70b..210f015 100644
--- a/graphics/integration-tests/testapp/build.gradle
+++ b/graphics/integration-tests/testapp/build.gradle
@@ -36,5 +36,5 @@
 }
 
 android {
-    namespace "androidx.graphics.shapes.test"
+    namespace = "androidx.graphics.shapes.test"
 }
diff --git a/gridlayout/gridlayout/build.gradle b/gridlayout/gridlayout/build.gradle
index eacac76..728a5ba 100644
--- a/gridlayout/gridlayout/build.gradle
+++ b/gridlayout/gridlayout/build.gradle
@@ -32,5 +32,5 @@
 }
 
 android {
-    namespace "androidx.gridlayout"
+    namespace = "androidx.gridlayout"
 }
diff --git a/health/connect/connect-client/build.gradle b/health/connect/connect-client/build.gradle
index 4b21042..75feed2 100644
--- a/health/connect/connect-client/build.gradle
+++ b/health/connect/connect-client/build.gradle
@@ -68,7 +68,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildFeatures {
         aidl = true
@@ -77,7 +77,7 @@
         consumerProguardFiles "proguard-rules.pro"
     }
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.health.connect.client"
+    namespace = "androidx.health.connect.client"
     compileSdk = 35
 }
 
diff --git a/health/connect/connect-client/samples/build.gradle b/health/connect/connect-client/samples/build.gradle
index fb7bcef..0f3267b 100644
--- a/health/connect/connect-client/samples/build.gradle
+++ b/health/connect/connect-client/samples/build.gradle
@@ -47,9 +47,9 @@
 }
 
 android {
-    namespace "androidx.health.connect.client.samples"
+    namespace = "androidx.health.connect.client.samples"
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     compileSdk = 35
 }
diff --git a/health/connect/connect-testing/build.gradle b/health/connect/connect-testing/build.gradle
index fe49e27..f526cf4 100644
--- a/health/connect/connect-testing/build.gradle
+++ b/health/connect/connect-testing/build.gradle
@@ -43,9 +43,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.health.connect.testing"
+    namespace = "androidx.health.connect.testing"
     testOptions.unitTests.includeAndroidResources = true
     compileSdk = 35
 }
diff --git a/health/connect/connect-testing/samples/build.gradle b/health/connect/connect-testing/samples/build.gradle
index 9d275ab7..0ddc710 100644
--- a/health/connect/connect-testing/samples/build.gradle
+++ b/health/connect/connect-testing/samples/build.gradle
@@ -47,9 +47,9 @@
 }
 
 android {
-    namespace "androidx.health.connect.testing.samples"
+    namespace = "androidx.health.connect.testing.samples"
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     compileSdk = 35
 }
diff --git a/health/health-services-client/build.gradle b/health/health-services-client/build.gradle
index e8a9e92..cd669b2 100644
--- a/health/health-services-client/build.gradle
+++ b/health/health-services-client/build.gradle
@@ -53,19 +53,19 @@
 
 android {
     defaultConfig {
-        minSdkVersion 30
+        minSdk = 30
     }
     buildFeatures {
         aidl = true
     }
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
 
         stableAidl {
-            version 1
+            version = 1
         }
     }
-    namespace "androidx.health.services.client"
+    namespace = "androidx.health.services.client"
 }
 
 androidx {
diff --git a/heifwriter/heifwriter/build.gradle b/heifwriter/heifwriter/build.gradle
index 2c3875b..7f8d288 100644
--- a/heifwriter/heifwriter/build.gradle
+++ b/heifwriter/heifwriter/build.gradle
@@ -14,9 +14,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 28
+        minSdk = 28
     }
-    namespace "androidx.heifwriter"
+    namespace = "androidx.heifwriter"
 }
 
 dependencies {
diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle
index 19b6acb..2d97039 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -35,11 +35,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         testInstrumentationRunner "androidx.hilt.navigation.compose.TestRunner"
     }
-    namespace "androidx.hilt.navigation.compose"
+    namespace = "androidx.hilt.navigation.compose"
 }
 
 dependencies {
diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle
index 06d2f91..0c455f0 100644
--- a/hilt/hilt-navigation-compose/samples/build.gradle
+++ b/hilt/hilt-navigation-compose/samples/build.gradle
@@ -50,6 +50,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.hilt.navigation.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.hilt.navigation.compose.samples"
 }
diff --git a/hilt/hilt-navigation-fragment/build.gradle b/hilt/hilt-navigation-fragment/build.gradle
index c78ad99..a93567f 100644
--- a/hilt/hilt-navigation-fragment/build.gradle
+++ b/hilt/hilt-navigation-fragment/build.gradle
@@ -37,7 +37,7 @@
     defaultConfig {
         testInstrumentationRunner "androidx.hilt.navigation.fragment.TestRunner"
     }
-    namespace "androidx.hilt.navigation.fragment"
+    namespace = "androidx.hilt.navigation.fragment"
 }
 
 dependencies {
diff --git a/hilt/hilt-navigation/build.gradle b/hilt/hilt-navigation/build.gradle
index 6ce18e5..92b4788 100644
--- a/hilt/hilt-navigation/build.gradle
+++ b/hilt/hilt-navigation/build.gradle
@@ -51,5 +51,5 @@
 }
 
 android {
-    namespace "androidx.hilt.navigation"
+    namespace = "androidx.hilt.navigation"
 }
diff --git a/hilt/hilt-work/build.gradle b/hilt/hilt-work/build.gradle
index 26056f9..1492938 100644
--- a/hilt/hilt-work/build.gradle
+++ b/hilt/hilt-work/build.gradle
@@ -32,7 +32,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.hilt.work"
+    namespace = "androidx.hilt.work"
 }
 
 dependencies {
diff --git a/hilt/integration-tests/viewmodelapp/build.gradle b/hilt/integration-tests/viewmodelapp/build.gradle
index 12eec0a..6e7d83b 100644
--- a/hilt/integration-tests/viewmodelapp/build.gradle
+++ b/hilt/integration-tests/viewmodelapp/build.gradle
@@ -23,17 +23,17 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
         testInstrumentationRunner "androidx.hilt.integration.viewmodelapp.TestRunner"
     }
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
-    namespace "androidx.hilt.integration.viewmodelapp"
+    namespace = "androidx.hilt.integration.viewmodelapp"
 }
 
 dependencies {
diff --git a/hilt/integration-tests/workerapp/build.gradle b/hilt/integration-tests/workerapp/build.gradle
index b277151..cab8619 100644
--- a/hilt/integration-tests/workerapp/build.gradle
+++ b/hilt/integration-tests/workerapp/build.gradle
@@ -23,17 +23,17 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         testInstrumentationRunner "androidx.hilt.integration.workerapp.TestRunner"
     }
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
         }
     }
-    namespace "androidx.hilt.integration.workerapp"
+    namespace = "androidx.hilt.integration.workerapp"
 }
 
 dependencies {
diff --git a/input/input-motionprediction/build.gradle b/input/input-motionprediction/build.gradle
index b15a852..cdf3178 100644
--- a/input/input-motionprediction/build.gradle
+++ b/input/input-motionprediction/build.gradle
@@ -50,7 +50,7 @@
 android {
     defaultConfig {
     }
-    namespace "androidx.input.motionprediction"
+    namespace = "androidx.input.motionprediction"
 }
 
 androidx {
diff --git a/inspection/inspection-testing/build.gradle b/inspection/inspection-testing/build.gradle
index 4aebd0f..8067271 100644
--- a/inspection/inspection-testing/build.gradle
+++ b/inspection/inspection-testing/build.gradle
@@ -53,7 +53,7 @@
 android {
     defaultConfig {
         // studio pipeline works only starting with Android O
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.inspection.testing"
+    namespace = "androidx.inspection.testing"
 }
diff --git a/inspection/inspection/build.gradle b/inspection/inspection/build.gradle
index 204a479e..6bc3ce0 100644
--- a/inspection/inspection/build.gradle
+++ b/inspection/inspection/build.gradle
@@ -55,14 +55,14 @@
 android {
     defaultConfig {
         // studio pipeline works only starting with Android O
-        minSdkVersion 26
+        minSdk = 26
     }
 
     externalNativeBuild {
         cmake {
             path "src/main/native/CMakeLists.txt"
-            version "3.22.1"
+            version = libs.versions.cmake.get()
         }
     }
-    namespace "androidx.inspection"
+    namespace = "androidx.inspection"
 }
diff --git a/interpolator/interpolator/build.gradle b/interpolator/interpolator/build.gradle
index ce31af1..9853fc8 100644
--- a/interpolator/interpolator/build.gradle
+++ b/interpolator/interpolator/build.gradle
@@ -24,5 +24,5 @@
 }
 
 android {
-    namespace "androidx.interpolator"
+    namespace = "androidx.interpolator"
 }
diff --git a/javascriptengine/javascriptengine/build.gradle b/javascriptengine/javascriptengine/build.gradle
index 29bac07..ec40d25 100644
--- a/javascriptengine/javascriptengine/build.gradle
+++ b/javascriptengine/javascriptengine/build.gradle
@@ -41,25 +41,24 @@
     androidTestImplementation(libs.testCore)
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.testRules)
-    // Add dependencies here
 }
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildFeatures {
         aidl = true
     }
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
     aaptOptions {
-        noCompress 'js'
+        noCompress = "js"
     }
-    namespace "androidx.javascriptengine"
+    namespace = "androidx.javascriptengine"
 }
 
 androidx {
diff --git a/leanback/leanback-grid/build.gradle b/leanback/leanback-grid/build.gradle
index c6ef5de..0134bf1 100644
--- a/leanback/leanback-grid/build.gradle
+++ b/leanback/leanback-grid/build.gradle
@@ -52,8 +52,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.leanback.widget"
+    compileSdk = 35
+    namespace = "androidx.leanback.widget"
 }
 
 androidx {
diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle
index 59fb483..69e45a6 100644
--- a/leanback/leanback-paging/build.gradle
+++ b/leanback/leanback-paging/build.gradle
@@ -47,12 +47,12 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     lintOptions {
         // Bug in Android Lint 7.0.0-alpha15 b/187419330
         disable("MissingLeanbackLauncher", "ImpliedTouchscreenHardware", "MissingLeanbackSupport")
     }
-    namespace "androidx.leanback.paging"
+    namespace = "androidx.leanback.paging"
 }
 
 androidx {
diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle
index b475160..8b42725 100644
--- a/leanback/leanback-preference/build.gradle
+++ b/leanback/leanback-preference/build.gradle
@@ -22,13 +22,13 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets {
         main.java.srcDirs += [
                 "api21"
         ]
     }
-    namespace "androidx.leanback.preference"
+    namespace = "androidx.leanback.preference"
 }
 
 androidx {
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle
index db293d5b..2d6e3e0 100644
--- a/leanback/leanback-tab/build.gradle
+++ b/leanback/leanback-tab/build.gradle
@@ -37,8 +37,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.leanback.tab"
+    compileSdk = 35
+    namespace = "androidx.leanback.tab"
 }
 
 androidx {
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle
index 55e9ae2..8061e01 100644
--- a/leanback/leanback/build.gradle
+++ b/leanback/leanback/build.gradle
@@ -39,7 +39,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets {
         main.java.srcDirs += [
                 "common",
@@ -47,7 +47,7 @@
                 "api21",
         ]
     }
-    namespace "androidx.leanback"
+    namespace = "androidx.leanback"
 }
 
 androidx {
diff --git a/lifecycle/integration-tests/kotlintestapp/build.gradle b/lifecycle/integration-tests/kotlintestapp/build.gradle
index ab9ca908..e2e603e 100644
--- a/lifecycle/integration-tests/kotlintestapp/build.gradle
+++ b/lifecycle/integration-tests/kotlintestapp/build.gradle
@@ -57,5 +57,5 @@
         test.java.srcDirs += "src/test-common/java"
         androidTest.java.srcDirs += "src/test-common/java"
     }
-    namespace "androidx.lifecycle.kotlintestapp"
+    namespace = "androidx.lifecycle.kotlintestapp"
 }
diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index 8588b3e..ce2d346 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle
@@ -46,5 +46,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.testapp"
+    namespace = "androidx.lifecycle.testapp"
 }
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index ddf4f8c..802867a 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -68,5 +68,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.extensions"
+    namespace = "androidx.lifecycle.extensions"
 }
diff --git a/lifecycle/lifecycle-livedata-core-ktx/build.gradle b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
index 108896c..0487afb 100644
--- a/lifecycle/lifecycle-livedata-core-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
@@ -43,5 +43,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.livedata.core.ktx"
+    namespace = "androidx.lifecycle.livedata.core.ktx"
 }
diff --git a/lifecycle/lifecycle-livedata-core-truth/build.gradle b/lifecycle/lifecycle-livedata-core-truth/build.gradle
index e743bd6..d17fe02 100644
--- a/lifecycle/lifecycle-livedata-core-truth/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-truth/build.gradle
@@ -47,5 +47,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.livedata.core.truth"
+    namespace = "androidx.lifecycle.livedata.core.truth"
 }
diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle
index f0e7c21..b5508cc 100644
--- a/lifecycle/lifecycle-livedata-core/build.gradle
+++ b/lifecycle/lifecycle-livedata-core/build.gradle
@@ -56,5 +56,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.livedata.core"
+    namespace = "androidx.lifecycle.livedata.core"
 }
diff --git a/lifecycle/lifecycle-livedata-ktx/build.gradle b/lifecycle/lifecycle-livedata-ktx/build.gradle
index 2b8f628..4991b7e 100644
--- a/lifecycle/lifecycle-livedata-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-ktx/build.gradle
@@ -56,5 +56,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.livedata.ktx"
+    namespace = "androidx.lifecycle.livedata.ktx"
 }
diff --git a/lifecycle/lifecycle-livedata/build.gradle b/lifecycle/lifecycle-livedata/build.gradle
index 2d336f0..aa95b79 100644
--- a/lifecycle/lifecycle-livedata/build.gradle
+++ b/lifecycle/lifecycle-livedata/build.gradle
@@ -64,5 +64,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.livedata"
+    namespace = "androidx.lifecycle.livedata"
 }
diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle
index 669a5d9..9aa412d 100644
--- a/lifecycle/lifecycle-process/build.gradle
+++ b/lifecycle/lifecycle-process/build.gradle
@@ -33,7 +33,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.lifecycle.process"
+    namespace = "androidx.lifecycle.process"
 }
 
 dependencies {
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
index b054abb..18ccd70 100644
--- a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
@@ -49,5 +49,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.reactivestreams.ktx"
+    namespace = "androidx.lifecycle.reactivestreams.ktx"
 }
diff --git a/lifecycle/lifecycle-reactivestreams/build.gradle b/lifecycle/lifecycle-reactivestreams/build.gradle
index 71eaf3b..d125912 100644
--- a/lifecycle/lifecycle-reactivestreams/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams/build.gradle
@@ -57,5 +57,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.reactivestreams"
+    namespace = "androidx.lifecycle.reactivestreams"
 }
diff --git a/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle b/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle
index e03ae24..ddfa56f 100644
--- a/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle
@@ -42,5 +42,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.runtime.compose.demos"
+    namespace = "androidx.lifecycle.runtime.compose.demos"
 }
diff --git a/lifecycle/lifecycle-runtime-compose/samples/build.gradle b/lifecycle/lifecycle-runtime-compose/samples/build.gradle
index c352425..2468e8b 100644
--- a/lifecycle/lifecycle-runtime-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/samples/build.gradle
@@ -47,6 +47,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.lifecycle.runtime.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.lifecycle.runtime.compose.samples"
 }
\ No newline at end of file
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle
index d1583e0..6a806cad 100644
--- a/lifecycle/lifecycle-runtime/build.gradle
+++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -141,7 +141,7 @@
     // Include `*.java` files into the build
     sourceSets["main"].java.srcDir("src/androidMain/java")
     sourceSets["test"].java.srcDir("src/androidUnitTest/kotlin")
-    namespace "androidx.lifecycle.runtime"
+    namespace = "androidx.lifecycle.runtime"
     // TODO(b/345531033)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
@@ -149,7 +149,7 @@
 androidx {
     name = "Lifecycle Runtime"
     type = LibraryType.PUBLISHED_LIBRARY
-    inceptionYear "2017"
-    description "Android Lifecycle Runtime"
+    inceptionYear = "2017"
+    description = "Android Lifecycle Runtime"
     metalavaK2UastEnabled = false
 }
diff --git a/lifecycle/lifecycle-service/build.gradle b/lifecycle/lifecycle-service/build.gradle
index a1f1195..3561fde 100644
--- a/lifecycle/lifecycle-service/build.gradle
+++ b/lifecycle/lifecycle-service/build.gradle
@@ -48,5 +48,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.service"
+    namespace = "androidx.lifecycle.service"
 }
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index a70993c..0731ab4 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -107,6 +107,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.lifecycle.viewmodel.compose"
+    compileSdk = 35
+    namespace = "androidx.lifecycle.viewmodel.compose"
 }
diff --git a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
index f7022a8..224f7bc 100644
--- a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
@@ -42,5 +42,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.viewmodel.compose.demos"
+    namespace = "androidx.lifecycle.viewmodel.compose.demos"
 }
diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
index 14fd173..683b8c6 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
@@ -50,6 +50,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.lifecycle.viewmodel.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.lifecycle.viewmodel.compose.samples"
 }
\ No newline at end of file
diff --git a/lifecycle/lifecycle-viewmodel-ktx/build.gradle b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
index b1d0a28..aadcb91 100644
--- a/lifecycle/lifecycle-viewmodel-ktx/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
@@ -43,5 +43,5 @@
 }
 
 android {
-    namespace "androidx.lifecycle.viewmodel.ktx"
+    namespace = "androidx.lifecycle.viewmodel.ktx"
 }
diff --git a/lifecycle/lifecycle-viewmodel-navigation3/build.gradle b/lifecycle/lifecycle-viewmodel-navigation3/build.gradle
index c3c6a20..2baa415 100644
--- a/lifecycle/lifecycle-viewmodel-navigation3/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-navigation3/build.gradle
@@ -96,8 +96,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.lifecycle.viewmodel.navigation3"
+    compileSdk = 35
+    namespace = "androidx.lifecycle.viewmodel.navigation3"
 }
 
 androidx {
diff --git a/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle
index f6ec15b..67d756a 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle
@@ -40,7 +40,7 @@
 }
 
 android {
-    namespace "androidx.lifecycle.viewmodel.savedstate.samples"
+    namespace = "androidx.lifecycle.viewmodel.savedstate.samples"
 }
 
 androidx {
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
index 3182d41..f6328b7 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
@@ -173,7 +173,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.lifecycle.viewmodel.savedstate"
+    namespace = "androidx.lifecycle.viewmodel.savedstate"
     experimentalProperties["android.lint.useK2Uast"] = false // TODO(b/345531033)
 }
 
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle
index 218d0a1..8929915 100644
--- a/lifecycle/lifecycle-viewmodel/build.gradle
+++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -130,7 +130,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.lifecycle.viewmodel"
+    namespace = "androidx.lifecycle.viewmodel"
 }
 
 androidx {
diff --git a/lint-checks/integration-tests/build.gradle b/lint-checks/integration-tests/build.gradle
index bde7c14..c3e1da3 100644
--- a/lint-checks/integration-tests/build.gradle
+++ b/lint-checks/integration-tests/build.gradle
@@ -43,9 +43,9 @@
 android {
     lintOptions {
         // We don't want errors to cause lint to fail
-        abortOnError false
+        abortOnError = false
     }
-    namespace "androidx.lint.integration.tests"
+    namespace = "androidx.lint.integration.tests"
 }
 
 
diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle
index e358346..ee2a484 100644
--- a/loader/loader-ktx/build.gradle
+++ b/loader/loader-ktx/build.gradle
@@ -55,6 +55,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.loader.ktx"
+    compileSdk = 35
+    namespace = "androidx.loader.ktx"
 }
diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle
index 1fd0bb1..6b03c9a 100644
--- a/loader/loader/build.gradle
+++ b/loader/loader/build.gradle
@@ -38,6 +38,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.loader"
+    compileSdk = 35
+    namespace = "androidx.loader"
 }
diff --git a/media/media/build.gradle b/media/media/build.gradle
index aead5c4..6643b06 100644
--- a/media/media/build.gradle
+++ b/media/media/build.gradle
@@ -56,7 +56,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.media"
+    namespace = "androidx.media"
 }
 
 androidx {
diff --git a/media/version-compat-tests/current/client/build.gradle b/media/version-compat-tests/current/client/build.gradle
index ef92604..fb2fa45 100644
--- a/media/version-compat-tests/current/client/build.gradle
+++ b/media/version-compat-tests/current/client/build.gradle
@@ -20,7 +20,7 @@
 }
 
 android {
-    namespace "android.support.mediacompat.client"
+    namespace = "android.support.mediacompat.client"
 }
 
 dependencies {
diff --git a/media/version-compat-tests/current/service/build.gradle b/media/version-compat-tests/current/service/build.gradle
index 4df95d8..96e963b 100644
--- a/media/version-compat-tests/current/service/build.gradle
+++ b/media/version-compat-tests/current/service/build.gradle
@@ -20,7 +20,7 @@
 }
 
 android {
-    namespace "android.support.mediacompat.service"
+    namespace = "android.support.mediacompat.service"
 }
 
 dependencies {
diff --git a/media/version-compat-tests/lib/build.gradle b/media/version-compat-tests/lib/build.gradle
index bca738f..9585da7 100644
--- a/media/version-compat-tests/lib/build.gradle
+++ b/media/version-compat-tests/lib/build.gradle
@@ -26,5 +26,5 @@
 }
 
 android {
-    namespace "android.support.mediacompat.testlib"
+    namespace = "android.support.mediacompat.testlib"
 }
diff --git a/media/version-compat-tests/previous/client/build.gradle b/media/version-compat-tests/previous/client/build.gradle
index 0c3fb61..2375ef8 100644
--- a/media/version-compat-tests/previous/client/build.gradle
+++ b/media/version-compat-tests/previous/client/build.gradle
@@ -20,7 +20,7 @@
 }
 
 android {
-    namespace "android.support.mediacompat.client"
+    namespace = "android.support.mediacompat.client"
 }
 
 dependencies {
diff --git a/media/version-compat-tests/previous/service/build.gradle b/media/version-compat-tests/previous/service/build.gradle
index fb05ca3..a0b9d68c0 100644
--- a/media/version-compat-tests/previous/service/build.gradle
+++ b/media/version-compat-tests/previous/service/build.gradle
@@ -20,7 +20,7 @@
 }
 
 android {
-    namespace "android.support.mediacompat.service"
+    namespace = "android.support.mediacompat.service"
 }
 
 dependencies {
diff --git a/mediarouter/mediarouter-testing/build.gradle b/mediarouter/mediarouter-testing/build.gradle
index 993da5e..fe6e799 100644
--- a/mediarouter/mediarouter-testing/build.gradle
+++ b/mediarouter/mediarouter-testing/build.gradle
@@ -41,6 +41,6 @@
 }
 
 android {
-    namespace "androidx.mediarouter.testing"
+    namespace = "androidx.mediarouter.testing"
 }
 
diff --git a/mediarouter/mediarouter/build.gradle b/mediarouter/mediarouter/build.gradle
index cf66748..946d365 100644
--- a/mediarouter/mediarouter/build.gradle
+++ b/mediarouter/mediarouter/build.gradle
@@ -63,7 +63,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.mediarouter"
+    namespace = "androidx.mediarouter"
 }
 
 androidx {
diff --git a/metrics/integration-tests/janktest/build.gradle b/metrics/integration-tests/janktest/build.gradle
index 90a1980..38cc3f2 100644
--- a/metrics/integration-tests/janktest/build.gradle
+++ b/metrics/integration-tests/janktest/build.gradle
@@ -22,10 +22,10 @@
 
 android {
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    compileSdk 35
-    namespace "androidx.metrics.performance.janktest"
+    compileSdk = 35
+    namespace = "androidx.metrics.performance.janktest"
 }
 
 dependencies {
diff --git a/metrics/metrics-benchmark/build.gradle b/metrics/metrics-benchmark/build.gradle
index 9246ef6..87d74a1 100644
--- a/metrics/metrics-benchmark/build.gradle
+++ b/metrics/metrics-benchmark/build.gradle
@@ -33,8 +33,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.metrics.performance.benchmark"
+    compileSdk = 35
+    namespace = "androidx.metrics.performance.benchmark"
     defaultConfig {
         // Enable measuring on an emulator, devices with low battery, and eng builds
         // We are only concerned with allocations in this benchmark, so runtime performance
diff --git a/metrics/metrics-performance/build.gradle b/metrics/metrics-performance/build.gradle
index 17ab3b1..47fb34d 100644
--- a/metrics/metrics-performance/build.gradle
+++ b/metrics/metrics-performance/build.gradle
@@ -56,8 +56,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.metrics.performance"
+    compileSdk = 35
+    namespace = "androidx.metrics.performance"
 }
 
 androidx {
diff --git a/navigation/integration-tests/testapp/build.gradle b/navigation/integration-tests/testapp/build.gradle
index 03d2eac..fea1563 100644
--- a/navigation/integration-tests/testapp/build.gradle
+++ b/navigation/integration-tests/testapp/build.gradle
@@ -44,8 +44,8 @@
 }
 
 android {
-    namespace "androidx.navigation.testapp"
-    compileSdk 35
+    namespace = "androidx.navigation.testapp"
+    compileSdk = 35
 }
 
 tasks["check"].dependsOn(tasks["connectedCheck"])
diff --git a/navigation/navigation-benchmark/build.gradle b/navigation/navigation-benchmark/build.gradle
index c9d8c35..bc91b4d 100644
--- a/navigation/navigation-benchmark/build.gradle
+++ b/navigation/navigation-benchmark/build.gradle
@@ -57,5 +57,5 @@
 }
 
 android {
-    namespace "androidx.navigation.benchmark"
+    namespace = "androidx.navigation.benchmark"
 }
diff --git a/navigation/navigation-common-ktx/build.gradle b/navigation/navigation-common-ktx/build.gradle
index 50189b1..2d7d658 100644
--- a/navigation/navigation-common-ktx/build.gradle
+++ b/navigation/navigation-common-ktx/build.gradle
@@ -46,5 +46,5 @@
 }
 
 android {
-    namespace "androidx.navigation.common.ktx"
+    namespace = "androidx.navigation.common.ktx"
 }
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle
index a506467..0d1e04d 100644
--- a/navigation/navigation-common/build.gradle
+++ b/navigation/navigation-common/build.gradle
@@ -36,7 +36,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.navigation.common"
+    namespace = "androidx.navigation.common"
 }
 
 dependencies {
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 1d733ed..22971db 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -99,9 +99,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/navigation/navigation-compose"
 
-    namespace "androidx.navigation.compose"
+    namespace = "androidx.navigation.compose"
 }
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
index 839752a..6950b97 100644
--- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
+++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
@@ -61,6 +61,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.navigation.compose.demos"
+    compileSdk = 35
+    namespace = "androidx.navigation.compose.demos"
 }
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index 94e0951..edfdb1f 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -69,6 +69,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.navigation.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.navigation.compose.samples"
 }
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle
index 5882bd7..3a85fc3 100644
--- a/navigation/navigation-dynamic-features-fragment/build.gradle
+++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -65,7 +65,7 @@
 }
 
 android {
-    namespace "androidx.navigation.dynamicfeatures.fragment"
+    namespace = "androidx.navigation.dynamicfeatures.fragment"
 }
 
 androidx {
diff --git a/navigation/navigation-dynamic-features-runtime/build.gradle b/navigation/navigation-dynamic-features-runtime/build.gradle
index d5f44ab..7d941b4 100644
--- a/navigation/navigation-dynamic-features-runtime/build.gradle
+++ b/navigation/navigation-dynamic-features-runtime/build.gradle
@@ -31,7 +31,7 @@
 }
 
 android {
-    namespace "androidx.navigation.dynamicfeatures"
+    namespace = "androidx.navigation.dynamicfeatures"
 }
 
 dependencies {
diff --git a/navigation/navigation-fragment-compose/build.gradle b/navigation/navigation-fragment-compose/build.gradle
index bbf7940..5e73fd3 100644
--- a/navigation/navigation-fragment-compose/build.gradle
+++ b/navigation/navigation-fragment-compose/build.gradle
@@ -63,8 +63,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.navigation.fragment.compose"
+    compileSdk = 35
+    namespace = "androidx.navigation.fragment.compose"
 }
 
 androidx {
diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle
index db88f98..ddfad9c 100644
--- a/navigation/navigation-fragment-ktx/build.gradle
+++ b/navigation/navigation-fragment-ktx/build.gradle
@@ -41,6 +41,6 @@
 }
 
 android {
-    namespace "androidx.navigation.fragment.ktx"
+    namespace = "androidx.navigation.fragment.ktx"
 }
 
diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle
index 0f7a785..dbc7670 100644
--- a/navigation/navigation-fragment/build.gradle
+++ b/navigation/navigation-fragment/build.gradle
@@ -78,5 +78,5 @@
 }
 
 android {
-    namespace "androidx.navigation.fragment"
+    namespace = "androidx.navigation.fragment"
 }
diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle
index 7ccfe8a..f27bf38 100644
--- a/navigation/navigation-runtime-ktx/build.gradle
+++ b/navigation/navigation-runtime-ktx/build.gradle
@@ -41,5 +41,5 @@
 }
 
 android {
-    namespace "androidx.navigation.ktx"
+    namespace = "androidx.navigation.ktx"
 }
diff --git a/navigation/navigation-runtime-truth/build.gradle b/navigation/navigation-runtime-truth/build.gradle
index 581b3f0..de14d57 100644
--- a/navigation/navigation-runtime-truth/build.gradle
+++ b/navigation/navigation-runtime-truth/build.gradle
@@ -54,5 +54,5 @@
 }
 
 android {
-    namespace "androidx.navigation.truth"
+    namespace = "androidx.navigation.truth"
 }
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index 90bfe60..7fa1524a 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -71,7 +71,7 @@
 }
 
 android {
-    namespace "androidx.navigation"
+    namespace = "androidx.navigation"
 }
 
 androidx {
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle
index a444acc..3c13c53 100644
--- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle
@@ -31,7 +31,7 @@
         }
     }
 
-    namespace "safe.gradle.test.app.safe.app"
+    namespace = "safe.gradle.test.app.safe.app"
     flavorDimensions "mode"
     productFlavors {
         foo {
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle
index 06523f8..36d149c 100644
--- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle
@@ -31,7 +31,7 @@
     }
     dynamicFeatures = [":app", ":feature", ":dynamic_feature"]
 
-    namespace "safe.gradle.test.app.safe"
+    namespace = "safe.gradle.test.app.safe"
     flavorDimensions "mode"
     productFlavors {
         foo {
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle
index 2b27848..bbd2867 100644
--- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle
@@ -30,7 +30,7 @@
         }
     }
 
-    namespace "safe.gradle.test.app.dynamic_feature"
+    namespace = "safe.gradle.test.app.dynamic_feature"
     flavorDimensions "mode"
     productFlavors {
         foo {
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle
index 52fedb8..d388794 100644
--- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle
@@ -31,7 +31,7 @@
         }
     }
 
-    namespace "safe.gradle.test.app.safe.feature"
+    namespace = "safe.gradle.test.app.safe.feature"
     flavorDimensions "mode"
     productFlavors {
         foo {
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle
index 47f266d..2ff929f 100644
--- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle
@@ -22,7 +22,7 @@
             storeFile file("$debugKeystoreFile")
         }
     }
-    namespace "safe.gradle.test.app.instant"
+    namespace = "safe.gradle.test.app.instant"
     flavorDimensions "mode"
     productFlavors {
         foo {
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle
index 2b229cc..1fee8828 100644
--- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle
@@ -31,7 +31,7 @@
         }
     }
 
-    namespace "safe.gradle.test.app.library"
+    namespace = "safe.gradle.test.app.library"
     flavorDimensions "mode"
     productFlavors {
         foo {
diff --git a/navigation/navigation-testing/build.gradle b/navigation/navigation-testing/build.gradle
index 92925b0..465107f 100644
--- a/navigation/navigation-testing/build.gradle
+++ b/navigation/navigation-testing/build.gradle
@@ -72,5 +72,5 @@
 }
 
 android {
-    namespace "androidx.navigation.testing"
+    namespace = "androidx.navigation.testing"
 }
diff --git a/navigation/navigation-ui-ktx/build.gradle b/navigation/navigation-ui-ktx/build.gradle
index 27b2f04..af667c3 100644
--- a/navigation/navigation-ui-ktx/build.gradle
+++ b/navigation/navigation-ui-ktx/build.gradle
@@ -41,5 +41,5 @@
 }
 
 android {
-    namespace "androidx.navigation.ui.ktx"
+    namespace = "androidx.navigation.ui.ktx"
 }
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle
index 7b15eb9..243e779 100644
--- a/navigation/navigation-ui/build.gradle
+++ b/navigation/navigation-ui/build.gradle
@@ -33,7 +33,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.navigation.ui"
+    namespace = "androidx.navigation.ui"
 }
 
 dependencies {
diff --git a/navigation3/navigation3/build.gradle b/navigation3/navigation3/build.gradle
index 1911ba9..755398f 100644
--- a/navigation3/navigation3/build.gradle
+++ b/navigation3/navigation3/build.gradle
@@ -106,8 +106,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.navigation3"
+    compileSdk = 35
+    namespace = "androidx.navigation3"
 }
 
 androidx {
diff --git a/navigation3/navigation3/samples/build.gradle b/navigation3/navigation3/samples/build.gradle
index 570fe03..cd517e3 100644
--- a/navigation3/navigation3/samples/build.gradle
+++ b/navigation3/navigation3/samples/build.gradle
@@ -62,6 +62,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.navigation3.samples"
+    compileSdk = 35
+    namespace = "androidx.navigation3.samples"
 }
diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle
index e70d7a1..355a48b 100644
--- a/paging/integration-tests/testapp/build.gradle
+++ b/paging/integration-tests/testapp/build.gradle
@@ -54,8 +54,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.paging.integration.testapp"
+    compileSdk = 35
+    namespace = "androidx.paging.integration.testapp"
 }
 
 // Enable parameter names to support Room incremental when its a project() dep.
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index 44cc355..01ca1bd 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -90,8 +90,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.paging.compose"
+    compileSdk = 35
+    namespace = "androidx.paging.compose"
     // TODO(b/313699418): need to update compose.runtime version to 1.6.0+
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle
index 901505d..9ef6e39 100644
--- a/paging/paging-compose/integration-tests/paging-demos/build.gradle
+++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle
@@ -56,6 +56,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.paging.compose.demos"
+    compileSdk = 35
+    namespace = "androidx.paging.compose.demos"
 }
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle
index 7a5578a..099945e 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -51,6 +51,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.paging.compose.samples"
+    compileSdk = 35
+    namespace = "androidx.paging.compose.samples"
 }
diff --git a/paging/paging-guava/build.gradle b/paging/paging-guava/build.gradle
index c62277b..fecd94c 100644
--- a/paging/paging-guava/build.gradle
+++ b/paging/paging-guava/build.gradle
@@ -55,5 +55,5 @@
 }
 
 android {
-    namespace "androidx.paging.guava"
+    namespace = "androidx.paging.guava"
 }
diff --git a/paging/paging-runtime-ktx/build.gradle b/paging/paging-runtime-ktx/build.gradle
index 3693aac..f8f24df 100644
--- a/paging/paging-runtime-ktx/build.gradle
+++ b/paging/paging-runtime-ktx/build.gradle
@@ -43,5 +43,5 @@
 }
 
 android {
-    namespace "androidx.paging.runtime.ktx"
+    namespace = "androidx.paging.runtime.ktx"
 }
diff --git a/paging/paging-runtime/build.gradle b/paging/paging-runtime/build.gradle
index 089bf53..75f71c6 100644
--- a/paging/paging-runtime/build.gradle
+++ b/paging/paging-runtime/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.paging.runtime"
+    namespace = "androidx.paging.runtime"
 }
 
 dependencies {
diff --git a/paging/paging-rxjava2-ktx/build.gradle b/paging/paging-rxjava2-ktx/build.gradle
index 974447a..368d74f 100644
--- a/paging/paging-rxjava2-ktx/build.gradle
+++ b/paging/paging-rxjava2-ktx/build.gradle
@@ -53,5 +53,5 @@
 }
 
 android {
-    namespace "androidx.paging.rxjava2.ktx"
+    namespace = "androidx.paging.rxjava2.ktx"
 }
diff --git a/paging/paging-rxjava2/build.gradle b/paging/paging-rxjava2/build.gradle
index 519c137..81f4adc 100644
--- a/paging/paging-rxjava2/build.gradle
+++ b/paging/paging-rxjava2/build.gradle
@@ -63,5 +63,5 @@
 }
 
 android {
-    namespace "androidx.paging.rxjava2"
+    namespace = "androidx.paging.rxjava2"
 }
diff --git a/paging/paging-rxjava3/build.gradle b/paging/paging-rxjava3/build.gradle
index 7f35dbb..62ab570 100644
--- a/paging/paging-rxjava3/build.gradle
+++ b/paging/paging-rxjava3/build.gradle
@@ -63,5 +63,5 @@
 }
 
 android {
-    namespace "androidx.paging.rxjava3"
+    namespace = "androidx.paging.rxjava3"
 }
diff --git a/paging/samples/build.gradle b/paging/samples/build.gradle
index fe24847..e4a123a 100644
--- a/paging/samples/build.gradle
+++ b/paging/samples/build.gradle
@@ -31,7 +31,7 @@
 }
 
 android {
-    namespace "androidx.paging.samples"
+    namespace = "androidx.paging.samples"
 }
 
 dependencies {
diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle
index e32c1cf..c28479e 100644
--- a/palette/palette-ktx/build.gradle
+++ b/palette/palette-ktx/build.gradle
@@ -46,5 +46,5 @@
 }
 
 android {
-    namespace "androidx.palette.ktx"
+    namespace = "androidx.palette.ktx"
 }
diff --git a/palette/palette/build.gradle b/palette/palette/build.gradle
index a8ca67f..4f70d2e 100644
--- a/palette/palette/build.gradle
+++ b/palette/palette/build.gradle
@@ -31,5 +31,5 @@
 }
 
 android {
-    namespace "androidx.palette"
+    namespace = "androidx.palette"
 }
diff --git a/pdf/integration-tests/testapp/build.gradle b/pdf/integration-tests/testapp/build.gradle
index 4a6ddfe..968ff9a 100644
--- a/pdf/integration-tests/testapp/build.gradle
+++ b/pdf/integration-tests/testapp/build.gradle
@@ -5,13 +5,13 @@
 }
 
 android {
-    namespace 'androidx.pdf.testapp'
+    namespace = "androidx.pdf.testapp"
 
     defaultConfig {
-        applicationId "androidx.pdf.testapp"
-        minSdk 31
-        compileSdk 35
-        targetSdk 31
+        applicationId = "androidx.pdf.testapp"
+        minSdk = 31
+        compileSdk = 35
+        targetSdk = 31
     }
 
     sourceSets {
diff --git a/pdf/pdf-document-service/build.gradle b/pdf/pdf-document-service/build.gradle
index adaf0d6..e2dc92d 100644
--- a/pdf/pdf-document-service/build.gradle
+++ b/pdf/pdf-document-service/build.gradle
@@ -50,18 +50,18 @@
 }
 
 android {
-    namespace "androidx.pdf.document.service"
+    namespace = "androidx.pdf.document.service"
 
     defaultConfig {
-        minSdk 31
-        compileSdk 35
+        minSdk = 31
+        compileSdk = 35
     }
 
     buildFeatures.aidl = true
 
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
 
diff --git a/pdf/pdf-viewer-fragment/build.gradle b/pdf/pdf-viewer-fragment/build.gradle
index 91e8d7b..cb1755b 100644
--- a/pdf/pdf-viewer-fragment/build.gradle
+++ b/pdf/pdf-viewer-fragment/build.gradle
@@ -47,12 +47,12 @@
 }
 
 android {
-    namespace "androidx.pdf.viewer.fragment"
+    namespace = "androidx.pdf.viewer.fragment"
 
     defaultConfig {
-        minSdk 31
-        compileSdk 35
-        targetSdk 31
+        minSdk = 31
+        compileSdk = 35
+        targetSdk = 31
     }
 }
 
diff --git a/pdf/pdf-viewer/build.gradle b/pdf/pdf-viewer/build.gradle
index 2bdc6d2..7581404 100644
--- a/pdf/pdf-viewer/build.gradle
+++ b/pdf/pdf-viewer/build.gradle
@@ -62,12 +62,12 @@
 }
 
 android {
-    namespace "androidx.pdf"
+    namespace = "androidx.pdf"
 
     defaultConfig {
-        minSdk 31
-        compileSdk 35
-        targetSdk 31
+        minSdk = 31
+        compileSdk = 35
+        targetSdk = 31
     }
 
     buildFeatures {
@@ -76,7 +76,7 @@
 
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
 
diff --git a/percentlayout/percentlayout/build.gradle b/percentlayout/percentlayout/build.gradle
index b5601d5..60f1df4 100644
--- a/percentlayout/percentlayout/build.gradle
+++ b/percentlayout/percentlayout/build.gradle
@@ -28,7 +28,7 @@
     sourceSets {
         main.res.srcDir "res"
     }
-    namespace "androidx.percentlayout"
+    namespace = "androidx.percentlayout"
 }
 
 androidx {
diff --git a/placeholder-tests/build.gradle b/placeholder-tests/build.gradle
index 20e7b60e..048f898 100644
--- a/placeholder-tests/build.gradle
+++ b/placeholder-tests/build.gradle
@@ -32,5 +32,5 @@
 }
 
 android {
-    namespace "androidx.testinfra.placeholderintegrationtest"
+    namespace = "androidx.testinfra.placeholderintegrationtest"
 }
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle
index 9696502..c91363f 100644
--- a/preference/preference-ktx/build.gradle
+++ b/preference/preference-ktx/build.gradle
@@ -56,5 +56,5 @@
 }
 
 android {
-    namespace "androidx.preference.ktx"
+    namespace = "androidx.preference.ktx"
 }
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle
index 56e3eb5..b4bd3f9 100644
--- a/preference/preference/build.gradle
+++ b/preference/preference/build.gradle
@@ -60,7 +60,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.preference"
+    namespace = "androidx.preference"
 }
 
 androidx {
diff --git a/print/print/build.gradle b/print/print/build.gradle
index b5ba83ba..08ea955 100644
--- a/print/print/build.gradle
+++ b/print/print/build.gradle
@@ -25,5 +25,5 @@
 }
 
 android {
-    namespace "androidx.print"
+    namespace = "androidx.print"
 }
diff --git a/privacysandbox/activity/activity-client/build.gradle b/privacysandbox/activity/activity-client/build.gradle
index 71070cb..65c51db 100644
--- a/privacysandbox/activity/activity-client/build.gradle
+++ b/privacysandbox/activity/activity-client/build.gradle
@@ -47,11 +47,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.privacysandbox.activity.client"
-    defaultConfig {
-        minSdk 21
-    }
+    compileSdk = 35
+    namespace = "androidx.privacysandbox.activity.client"
 }
 
 androidx {
diff --git a/privacysandbox/activity/activity-core/build.gradle b/privacysandbox/activity/activity-core/build.gradle
index 3d57c3c..ea5f13f 100644
--- a/privacysandbox/activity/activity-core/build.gradle
+++ b/privacysandbox/activity/activity-core/build.gradle
@@ -36,18 +36,15 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.activity.core"
+    namespace = "androidx.privacysandbox.activity.core"
     buildFeatures {
         aidl = true
     }
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
-    defaultConfig {
-        minSdk 21
-    }
 }
 
 androidx {
diff --git a/privacysandbox/activity/activity-provider/build.gradle b/privacysandbox/activity/activity-provider/build.gradle
index c191036..e4a213d 100644
--- a/privacysandbox/activity/activity-provider/build.gradle
+++ b/privacysandbox/activity/activity-provider/build.gradle
@@ -45,11 +45,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.privacysandbox.activity.provider"
-    defaultConfig {
-        minSdk 21
-    }
+    compileSdk = 35
+    namespace = "androidx.privacysandbox.activity.provider"
 }
 
 androidx {
diff --git a/privacysandbox/ads/ads-adservices-java/build.gradle b/privacysandbox/ads/ads-adservices-java/build.gradle
index a66f24d..950c240 100644
--- a/privacysandbox/ads/ads-adservices-java/build.gradle
+++ b/privacysandbox/ads/ads-adservices-java/build.gradle
@@ -61,7 +61,7 @@
 android {
     compileSdk = 34
     compileSdkExtension = 12
-    namespace "androidx.privacysandbox.ads.adservices.java"
+    namespace = "androidx.privacysandbox.ads.adservices.java"
 }
 
 androidx {
diff --git a/privacysandbox/ads/ads-adservices/build.gradle b/privacysandbox/ads/ads-adservices/build.gradle
index afa4d60..28fccf9 100644
--- a/privacysandbox/ads/ads-adservices/build.gradle
+++ b/privacysandbox/ads/ads-adservices/build.gradle
@@ -53,7 +53,7 @@
 android {
     compileSdk = 34
     compileSdkExtension = 12
-    namespace "androidx.privacysandbox.ads.adservices"
+    namespace = "androidx.privacysandbox.ads.adservices"
 }
 
 androidx {
diff --git a/privacysandbox/sdkruntime/integration-tests/testaidl/build.gradle b/privacysandbox/sdkruntime/integration-tests/testaidl/build.gradle
index d52c0e9..a636f23 100644
--- a/privacysandbox/sdkruntime/integration-tests/testaidl/build.gradle
+++ b/privacysandbox/sdkruntime/integration-tests/testaidl/build.gradle
@@ -21,7 +21,7 @@
 }
 
 android {
-    namespace 'androidx.privacysandbox.sdkruntime.integration.testaidl'
+    namespace = "androidx.privacysandbox.sdkruntime.integration.testaidl"
 
     buildFeatures {
         aidl = true
diff --git a/privacysandbox/sdkruntime/integration-tests/testapp/build.gradle b/privacysandbox/sdkruntime/integration-tests/testapp/build.gradle
index 1ae4595..ded7dd86 100644
--- a/privacysandbox/sdkruntime/integration-tests/testapp/build.gradle
+++ b/privacysandbox/sdkruntime/integration-tests/testapp/build.gradle
@@ -19,11 +19,11 @@
     id('org.jetbrains.kotlin.android')
 }
 android {
-    namespace 'androidx.privacysandbox.sdkruntime.integration.testapp'
+    namespace = "androidx.privacysandbox.sdkruntime.integration.testapp"
     defaultConfig {
-        applicationId 'androidx.privacysandbox.sdkruntime.integration.testapp'
-        compileSdk 35
-        compileSdkExtension 14
+        applicationId = "androidx.privacysandbox.sdkruntime.integration.testapp"
+        compileSdk = 35
+        compileSdkExtension = 14
     }
     privacySandbox {
         enable = true
diff --git a/privacysandbox/sdkruntime/integration-tests/testsdk-asb/build.gradle b/privacysandbox/sdkruntime/integration-tests/testsdk-asb/build.gradle
index 6b04d02..685c68b 100644
--- a/privacysandbox/sdkruntime/integration-tests/testsdk-asb/build.gradle
+++ b/privacysandbox/sdkruntime/integration-tests/testsdk-asb/build.gradle
@@ -20,11 +20,12 @@
     id 'AndroidXPlugin'
     id 'com.android.privacy-sandbox-sdk'
 }
+
 android {
-    namespace 'androidx.privacysandbox.sdkruntime.integration.testsdk-asb'
-    compileSdk 35
-    compileSdkExtension 14
-    buildToolsVersion AndroidXConfig.getDefaultAndroidConfig(project).getBuildToolsVersion()
+    namespace = "androidx.privacysandbox.sdkruntime.integration.testsdk-asb"
+    compileSdk = 35
+    compileSdkExtension = 14
+    buildToolsVersion = AndroidXConfig.getDefaultAndroidConfig(project).getBuildToolsVersion()
     bundle {
         packageName = "androidx.privacysandbox.sdkruntime.integrationtest.sdk"
 
@@ -38,6 +39,7 @@
         setVersion(1, 0, 0)
     }
 }
+
 dependencies {
-    include project(':privacysandbox:sdkruntime:integration-tests:testsdk')
+    include(project(':privacysandbox:sdkruntime:integration-tests:testsdk'))
 }
diff --git a/privacysandbox/sdkruntime/integration-tests/testsdk/build.gradle b/privacysandbox/sdkruntime/integration-tests/testsdk/build.gradle
index b05f039..fec84a8 100644
--- a/privacysandbox/sdkruntime/integration-tests/testsdk/build.gradle
+++ b/privacysandbox/sdkruntime/integration-tests/testsdk/build.gradle
@@ -21,11 +21,11 @@
 }
 
 android {
-    namespace 'androidx.privacysandbox.sdkruntime.integration.testsdk'
+    namespace = "androidx.privacysandbox.sdkruntime.integration.testsdk"
 
     defaultConfig {
-        compileSdk 35
-        compileSdkExtension 14
+        compileSdk = 35
+        compileSdkExtension = 14
     }
 }
 
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
index 21bfff6..d90c9a2 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
@@ -140,7 +140,7 @@
         }
     }
 
-    namespace "androidx.privacysandbox.sdkruntime.client"
+    namespace = "androidx.privacysandbox.sdkruntime.client"
     compileSdk = 35
     compileSdkExtension = 14
 }
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
index 5e2d2f3..1a1cd6f 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
@@ -55,7 +55,7 @@
         disable("BanKeepAnnotation")
     }
 
-    namespace "androidx.privacysandbox.sdkruntime.core"
+    namespace = "androidx.privacysandbox.sdkruntime.core"
     compileSdk = 35
     compileSdkExtension = 14
 }
diff --git a/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle b/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle
index 234a44d..814449d 100644
--- a/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle
@@ -43,7 +43,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.sdkruntime.provider"
+    namespace = "androidx.privacysandbox.sdkruntime.provider"
     compileSdk = 35
     compileSdkExtension = 14
 }
diff --git a/privacysandbox/sdkruntime/test-sdks/current/build.gradle b/privacysandbox/sdkruntime/test-sdks/current/build.gradle
index ddc4029..964ab36 100644
--- a/privacysandbox/sdkruntime/test-sdks/current/build.gradle
+++ b/privacysandbox/sdkruntime/test-sdks/current/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.sdkruntime.testsdk.current"
+    namespace = "androidx.privacysandbox.sdkruntime.testsdk.current"
 
     compileSdk = 35
     compileSdkExtension = 14
diff --git a/privacysandbox/sdkruntime/test-sdks/v4/build.gradle b/privacysandbox/sdkruntime/test-sdks/v4/build.gradle
index 510e9f2..daca12e 100644
--- a/privacysandbox/sdkruntime/test-sdks/v4/build.gradle
+++ b/privacysandbox/sdkruntime/test-sdks/v4/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.sdkruntime.testsdk.v4"
+    namespace = "androidx.privacysandbox.sdkruntime.testsdk.v4"
 }
 
 dependencies {
diff --git a/privacysandbox/sdkruntime/test-sdks/v5/build.gradle b/privacysandbox/sdkruntime/test-sdks/v5/build.gradle
index 9b98f82..d010075 100644
--- a/privacysandbox/sdkruntime/test-sdks/v5/build.gradle
+++ b/privacysandbox/sdkruntime/test-sdks/v5/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.sdkruntime.testsdk.v5"
+    namespace = "androidx.privacysandbox.sdkruntime.testsdk.v5"
 }
 
 dependencies {
diff --git a/privacysandbox/sdkruntime/test-sdks/v6/build.gradle b/privacysandbox/sdkruntime/test-sdks/v6/build.gradle
index 5384e0d..0c6ef85 100644
--- a/privacysandbox/sdkruntime/test-sdks/v6/build.gradle
+++ b/privacysandbox/sdkruntime/test-sdks/v6/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.sdkruntime.testsdk.v6"
+    namespace = "androidx.privacysandbox.sdkruntime.testsdk.v6"
 }
 
 dependencies {
diff --git a/privacysandbox/sdkruntime/test-sdks/v7/build.gradle b/privacysandbox/sdkruntime/test-sdks/v7/build.gradle
index 5f82a29..10894e1 100644
--- a/privacysandbox/sdkruntime/test-sdks/v7/build.gradle
+++ b/privacysandbox/sdkruntime/test-sdks/v7/build.gradle
@@ -23,7 +23,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.sdkruntime.testsdk.v7"
+    namespace = "androidx.privacysandbox.sdkruntime.testsdk.v7"
 
     compileSdk = 35
     compileSdkExtension = 14
diff --git a/privacysandbox/tools/integration-tests/testapp/build.gradle b/privacysandbox/tools/integration-tests/testapp/build.gradle
index d663562..0a33a14c 100644
--- a/privacysandbox/tools/integration-tests/testapp/build.gradle
+++ b/privacysandbox/tools/integration-tests/testapp/build.gradle
@@ -21,15 +21,13 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.tools.integration.testapp"
+    namespace = "androidx.privacysandbox.tools.integration.testapp"
 
     defaultConfig {
-        applicationId "androidx.privacysandbox.tools.integration.testapp"
-        minSdk 33
-        compileSdk 35
-        compileSdkExtension 14
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        applicationId = "androidx.privacysandbox.tools.integration.testapp"
+        minSdk = 33
+        compileSdk = 35
+        compileSdkExtension = 14
     }
     experimentalProperties["android.privacySandboxSdk.apiGenerator"] =
             project.dependencies.create(project(":privacysandbox:tools:tools-apigenerator"))
diff --git a/privacysandbox/tools/integration-tests/testsdk-asb/build.gradle b/privacysandbox/tools/integration-tests/testsdk-asb/build.gradle
index 90c74dd9..bd5584c 100644
--- a/privacysandbox/tools/integration-tests/testsdk-asb/build.gradle
+++ b/privacysandbox/tools/integration-tests/testsdk-asb/build.gradle
@@ -28,7 +28,7 @@
     //  buildToolsVersion for this plugin. We shouldn't be setting these manually.
     compileSdk = 35
     compileSdkExtension = 14
-    buildToolsVersion AndroidXConfig.getDefaultAndroidConfig(project).getBuildToolsVersion()
+    buildToolsVersion = AndroidXConfig.getDefaultAndroidConfig(project).getBuildToolsVersion()
 
     bundle {
         packageName = "androidx.privacysandbox.tools.integration.sdk"
diff --git a/privacysandbox/ui/integration-tests/mediateesdkprovider/build.gradle b/privacysandbox/ui/integration-tests/mediateesdkprovider/build.gradle
index 1286250..5dd2fc2 100644
--- a/privacysandbox/ui/integration-tests/mediateesdkprovider/build.gradle
+++ b/privacysandbox/ui/integration-tests/mediateesdkprovider/build.gradle
@@ -21,13 +21,13 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.integration.mediateesdkprovider"
-    compileSdk 35
-    compileSdkExtension 14
+    namespace = "androidx.privacysandbox.ui.integration.mediateesdkprovider"
+    compileSdk = 35
+    compileSdkExtension = 14
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
         }
     }
 }
diff --git a/privacysandbox/ui/integration-tests/mediateesdkproviderwrapper/build.gradle b/privacysandbox/ui/integration-tests/mediateesdkproviderwrapper/build.gradle
index d3cf55f..5aed355 100644
--- a/privacysandbox/ui/integration-tests/mediateesdkproviderwrapper/build.gradle
+++ b/privacysandbox/ui/integration-tests/mediateesdkproviderwrapper/build.gradle
@@ -22,11 +22,11 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.integration.mediateesdkproviderwrapper"
-    compileSdk 35
-    compileSdkExtension 14
-    minSdk 21
-    buildToolsVersion AndroidXConfig.getDefaultAndroidConfig(project).buildToolsVersion
+    namespace = "androidx.privacysandbox.ui.integration.mediateesdkproviderwrapper"
+    compileSdk = 35
+    compileSdkExtension = 14
+    minSdk = 21
+    buildToolsVersion = AndroidXConfig.getDefaultAndroidConfig(project).buildToolsVersion
 
     bundle {
         packageName = "androidx.privacysandbox.ui.integration.mediateesdkproviderwrapper"
diff --git a/privacysandbox/ui/integration-tests/sdkproviderutils/build.gradle b/privacysandbox/ui/integration-tests/sdkproviderutils/build.gradle
index 8f9c0d1..930f1add 100644
--- a/privacysandbox/ui/integration-tests/sdkproviderutils/build.gradle
+++ b/privacysandbox/ui/integration-tests/sdkproviderutils/build.gradle
@@ -21,8 +21,8 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.integration.sdkproviderutils"
-    compileSdk 35
+    namespace = "androidx.privacysandbox.ui.integration.sdkproviderutils"
+    compileSdk = 35
 }
 
 dependencies {
diff --git a/privacysandbox/ui/integration-tests/testaidl/build.gradle b/privacysandbox/ui/integration-tests/testaidl/build.gradle
index 81f35c4..5a383de 100644
--- a/privacysandbox/ui/integration-tests/testaidl/build.gradle
+++ b/privacysandbox/ui/integration-tests/testaidl/build.gradle
@@ -21,11 +21,11 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.integration.testaidl"
+    namespace = "androidx.privacysandbox.ui.integration.testaidl"
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
         }
     }
     buildFeatures {
diff --git a/privacysandbox/ui/integration-tests/testapp/build.gradle b/privacysandbox/ui/integration-tests/testapp/build.gradle
index a8b2e5f..f5bb827 100644
--- a/privacysandbox/ui/integration-tests/testapp/build.gradle
+++ b/privacysandbox/ui/integration-tests/testapp/build.gradle
@@ -21,18 +21,18 @@
 }
 
 android {
-    compileSdk 35
-    compileSdkExtension 14
-    namespace "androidx.privacysandbox.ui.integration.testapp"
+    compileSdk = 35
+    compileSdkExtension = 14
+    namespace = "androidx.privacysandbox.ui.integration.testapp"
 
     defaultConfig {
-        applicationId "androidx.privacysandbox.ui.integration.testapp"
-        targetSdk 35
+        applicationId = "androidx.privacysandbox.ui.integration.testapp"
+        targetSdk = 35
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
         }
     }
 
diff --git a/privacysandbox/ui/integration-tests/testingutils/build.gradle b/privacysandbox/ui/integration-tests/testingutils/build.gradle
index d27936e..c14d5c6 100644
--- a/privacysandbox/ui/integration-tests/testingutils/build.gradle
+++ b/privacysandbox/ui/integration-tests/testingutils/build.gradle
@@ -21,8 +21,8 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.integration.testingutils"
-    compileSdk 35
+    namespace = "androidx.privacysandbox.ui.integration.testingutils"
+    compileSdk = 35
 }
 
 dependencies {
diff --git a/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle b/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle
index 3787362..5c040e0 100644
--- a/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle
+++ b/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle
@@ -21,13 +21,13 @@
 }
 
 android {
-    compileSdk 35
-    compileSdkExtension 14
-    namespace 'androidx.privacysandbox.ui.integration.testsdkprovider'
+    compileSdk = 35
+    compileSdkExtension = 14
+    namespace = "androidx.privacysandbox.ui.integration.testsdkprovider"
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
         }
     }
 }
diff --git a/privacysandbox/ui/integration-tests/testsdkproviderwrapper/build.gradle b/privacysandbox/ui/integration-tests/testsdkproviderwrapper/build.gradle
index 886f035..885f8a8 100644
--- a/privacysandbox/ui/integration-tests/testsdkproviderwrapper/build.gradle
+++ b/privacysandbox/ui/integration-tests/testsdkproviderwrapper/build.gradle
@@ -22,11 +22,11 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.integration.testsdkproviderwrapper"
-    compileSdk 35
-    compileSdkExtension 14
-    minSdk 21
-    buildToolsVersion AndroidXConfig.getDefaultAndroidConfig(project).buildToolsVersion
+    namespace = "androidx.privacysandbox.ui.integration.testsdkproviderwrapper"
+    compileSdk = 35
+    compileSdkExtension = 14
+    minSdk = 21
+    buildToolsVersion = AndroidXConfig.getDefaultAndroidConfig(project).buildToolsVersion
 
     bundle {
         packageName = "androidx.privacysandbox.ui.integration.testsdkproviderwrapper"
diff --git a/privacysandbox/ui/ui-client/build.gradle b/privacysandbox/ui/ui-client/build.gradle
index 987f401d..e9578d2 100644
--- a/privacysandbox/ui/ui-client/build.gradle
+++ b/privacysandbox/ui/ui-client/build.gradle
@@ -58,8 +58,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.privacysandbox.ui.client"
+    compileSdk = 35
+    namespace = "androidx.privacysandbox.ui.client"
 }
 
 androidx {
diff --git a/privacysandbox/ui/ui-core/build.gradle b/privacysandbox/ui/ui-core/build.gradle
index a9ab12e..bbb6d03 100644
--- a/privacysandbox/ui/ui-core/build.gradle
+++ b/privacysandbox/ui/ui-core/build.gradle
@@ -44,13 +44,10 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.core"
+    namespace = "androidx.privacysandbox.ui.core"
     buildFeatures {
         aidl = true
     }
-    defaultConfig {
-        minSdk 21
-    }
 }
 
 androidx {
diff --git a/privacysandbox/ui/ui-provider/build.gradle b/privacysandbox/ui/ui-provider/build.gradle
index 6e49780..207dc4a 100644
--- a/privacysandbox/ui/ui-provider/build.gradle
+++ b/privacysandbox/ui/ui-provider/build.gradle
@@ -51,10 +51,7 @@
 }
 
 android {
-    namespace "androidx.privacysandbox.ui.provider"
-    defaultConfig {
-        minSdk 21
-    }
+    namespace = "androidx.privacysandbox.ui.provider"
 }
 
 androidx {
diff --git a/privacysandbox/ui/ui-tests/build.gradle b/privacysandbox/ui/ui-tests/build.gradle
index 38db96c..4250973 100644
--- a/privacysandbox/ui/ui-tests/build.gradle
+++ b/privacysandbox/ui/ui-tests/build.gradle
@@ -51,8 +51,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.privacysandbox.ui.tests"
+    compileSdk = 35
+    namespace = "androidx.privacysandbox.ui.tests"
 }
 
 androidx {
diff --git a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
index cf83e68..c1432f8 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
+++ b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
@@ -23,12 +23,12 @@
 android {
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    namespace "androidx.profileinstaller.integration.macrobenchmark.target"
+    namespace = "androidx.profileinstaller.integration.macrobenchmark.target"
 }
 
 dependencies {
diff --git a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
index 7088271..f967299 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
+++ b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.profileinstaller.integration.macrobenchmark"
+    namespace = "androidx.profileinstaller.integration.macrobenchmark"
     targetProjectPath = ":profileinstaller:integration-tests:init-macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle b/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle
index 4e59817..b23f324 100644
--- a/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle
+++ b/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle
@@ -32,14 +32,14 @@
 // This project can be removed once b/239659205 has landed and use only the
 // profile-verification-sample project.
 android {
-    compileSdk 35
+    compileSdk = 35
 
     buildTypes {
         release {
             // Minification and shrinking are disabled to avoid r8 removing unused methods and
             // speed up build process.
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled = false
+            shrinkResources = false
         }
     }
 
@@ -59,7 +59,7 @@
         }
     }
 
-    namespace "androidx.profileinstaller.integration.profileverification.target.no_initializer"
+    namespace = "androidx.profileinstaller.integration.profileverification.target.no_initializer"
 }
 
 dependencies {
diff --git a/profileinstaller/integration-tests/profile-verification-sample/build.gradle b/profileinstaller/integration-tests/profile-verification-sample/build.gradle
index 91cf92f..6756fa4 100644
--- a/profileinstaller/integration-tests/profile-verification-sample/build.gradle
+++ b/profileinstaller/integration-tests/profile-verification-sample/build.gradle
@@ -29,14 +29,14 @@
     id("kotlin-android")
 }
 android {
-    compileSdk 35
+    compileSdk = 35
 
     buildTypes {
         release {
             // Minification and shrinking are disabled to avoid r8 removing unused methods and
             // speed up build process.
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled = false
+            shrinkResources = false
         }
     }
 
@@ -56,7 +56,7 @@
         }
     }
 
-    namespace "androidx.profileinstaller.integration.profileverification.target"
+    namespace = "androidx.profileinstaller.integration.profileverification.target"
 }
 
 dependencies {
diff --git a/profileinstaller/integration-tests/profile-verification/build.gradle b/profileinstaller/integration-tests/profile-verification/build.gradle
index e92adac..0965694 100644
--- a/profileinstaller/integration-tests/profile-verification/build.gradle
+++ b/profileinstaller/integration-tests/profile-verification/build.gradle
@@ -89,12 +89,12 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
     sourceSets.androidTest.assets.srcDir(prepareAssetsTaskProvider.map { it.outputDir })
-    namespace "androidx.profileinstaller.integration.profileverification"
+    namespace = "androidx.profileinstaller.integration.profileverification"
 }
 
 // Define a configuration that can be resolved. This project is the consumer of test apks, i.e. it
diff --git a/profileinstaller/profileinstaller-benchmark/build.gradle b/profileinstaller/profileinstaller-benchmark/build.gradle
index d813b34..7af763e 100644
--- a/profileinstaller/profileinstaller-benchmark/build.gradle
+++ b/profileinstaller/profileinstaller-benchmark/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.profileinstaller.benchmark"
+    namespace = "androidx.profileinstaller.benchmark"
 }
diff --git a/profileinstaller/profileinstaller/build.gradle b/profileinstaller/profileinstaller/build.gradle
index fae706f..825420e 100644
--- a/profileinstaller/profileinstaller/build.gradle
+++ b/profileinstaller/profileinstaller/build.gradle
@@ -48,5 +48,5 @@
 }
 
 android {
-    namespace "androidx.profileinstaller"
+    namespace = "androidx.profileinstaller"
 }
diff --git a/recommendation/recommendation/build.gradle b/recommendation/recommendation/build.gradle
index e14ff18..76ddb90 100644
--- a/recommendation/recommendation/build.gradle
+++ b/recommendation/recommendation/build.gradle
@@ -17,7 +17,7 @@
 }
 
 android {
-    namespace "androidx.recommendation"
+    namespace = "androidx.recommendation"
 }
 
 androidx {
diff --git a/recyclerview/recyclerview-benchmark/build.gradle b/recyclerview/recyclerview-benchmark/build.gradle
index e609dfe..e627eaf 100644
--- a/recyclerview/recyclerview-benchmark/build.gradle
+++ b/recyclerview/recyclerview-benchmark/build.gradle
@@ -34,7 +34,7 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.recyclerview.benchmark"
+    compileSdk = 35
+    namespace = "androidx.recyclerview.benchmark"
 }
 
diff --git a/recyclerview/recyclerview-selection/build.gradle b/recyclerview/recyclerview-selection/build.gradle
index 4ebe801..5dbd3af 100644
--- a/recyclerview/recyclerview-selection/build.gradle
+++ b/recyclerview/recyclerview-selection/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.recyclerview.selection"
+    namespace = "androidx.recyclerview.selection"
 }
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index f9c876e..2281c27 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -59,7 +59,7 @@
         compileSdk = 35
         testInstrumentationRunner "androidx.recyclerview.test.TestRunner"
     }
-    namespace "androidx.recyclerview"
+    namespace = "androidx.recyclerview"
 }
 
 androidx {
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle
index 5cd252f..8e85742 100644
--- a/remotecallback/remotecallback/build.gradle
+++ b/remotecallback/remotecallback/build.gradle
@@ -41,7 +41,7 @@
 }
 
 android {
-    namespace "androidx.remotecallback"
+    namespace = "androidx.remotecallback"
 }
 
 androidx {
diff --git a/room/benchmark/build.gradle b/room/benchmark/build.gradle
index c679882..a65a1a2 100644
--- a/room/benchmark/build.gradle
+++ b/room/benchmark/build.gradle
@@ -49,7 +49,7 @@
 }
 
 android {
-    namespace "androidx.room.benchmark"
+    namespace = "androidx.room.benchmark"
 }
 
 androidx {
diff --git a/room/integration-tests/autovaluetestapp/build.gradle b/room/integration-tests/autovaluetestapp/build.gradle
index 3336f4f..04f09c0 100644
--- a/room/integration-tests/autovaluetestapp/build.gradle
+++ b/room/integration-tests/autovaluetestapp/build.gradle
@@ -42,7 +42,7 @@
 }
 
 android {
-    namespace "androidx.room.integration.autovaluetestapp"
+    namespace = "androidx.room.integration.autovaluetestapp"
 }
 
 // Enable parameter names to support Room incremental when its a project() dep.
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 1a62c78..ec3391c 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -46,7 +46,7 @@
             dimension "processorConfiguration"
         }
     }
-    namespace "androidx.room.integration.kotlintestapp"
+    namespace = "androidx.room.integration.kotlintestapp"
 }
 
 dependencies {
diff --git a/room/integration-tests/multiplatformtestapp/build.gradle b/room/integration-tests/multiplatformtestapp/build.gradle
index 4ba2f01..eeb3329 100644
--- a/room/integration-tests/multiplatformtestapp/build.gradle
+++ b/room/integration-tests/multiplatformtestapp/build.gradle
@@ -105,7 +105,7 @@
 }
 
 android {
-    namespace "androidx.room.integration.multiplatformtestapp"
+    namespace = "androidx.room.integration.multiplatformtestapp"
 }
 
 // Copy schema files to the iOS binary output test directory that will be part of the bundle's
diff --git a/room/integration-tests/noappcompattestapp/build.gradle b/room/integration-tests/noappcompattestapp/build.gradle
index 90d92b0..c8c58a8 100644
--- a/room/integration-tests/noappcompattestapp/build.gradle
+++ b/room/integration-tests/noappcompattestapp/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.room.integration.noappcompat"
+    namespace = "androidx.room.integration.noappcompat"
 }
 
 // Enable parameter names to support Room incremental when its a project() dep.
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index f020f5e..5ad76c5 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -63,9 +63,9 @@
         // For testing Java records
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
-        coreLibraryDesugaringEnabled true
+        coreLibraryDesugaringEnabled = true
     }
-    namespace "androidx.room.integration.testapp"
+    namespace = "androidx.room.integration.testapp"
 }
 
 dependencies {
diff --git a/room/room-compiler-processing/build.gradle b/room/room-compiler-processing/build.gradle
index 450707c..4cc1d58 100644
--- a/room/room-compiler-processing/build.gradle
+++ b/room/room-compiler-processing/build.gradle
@@ -107,11 +107,11 @@
 }
 
 tasks.withType(Test).configureEach { test ->
-    test.maxParallelForks(2)
+    test.maxParallelForks = 2
     test.systemProperty("androidx.room.compiler.processing.strict", "true")
     // With the move to K2 and KSP2 the memory usage has increased so we enlarge the heap
     // to prevent OOM while running all the tests in one go.
-    test.maxHeapSize("8g")
+    test.maxHeapSize = "8g"
 }
 
 androidx {
diff --git a/room/room-compiler/build.gradle b/room/room-compiler/build.gradle
index 8494f84..4c41d18 100644
--- a/room/room-compiler/build.gradle
+++ b/room/room-compiler/build.gradle
@@ -125,8 +125,8 @@
 
     @Inject
     public GenerateAntlrGrammar() {
-        description("Generates ANTLR Grammar used by Room")
-        group("build")
+        description = "Generates ANTLR Grammar used by Room"
+        group = "build"
     }
 
     @TaskAction
@@ -229,10 +229,10 @@
 
 tasks.withType(Test).configureEach {
     it.systemProperty("androidx.room.compiler.processing.strict", "true")
-    it.maxParallelForks(8)
+    it.maxParallelForks = 8
     if (project.providers.environmentVariable("GITHUB_ACTIONS").present) {
         // limit memory usage to avoid running out of memory in the docker container.
-        it.maxHeapSize("512m")
+        it.maxHeapSize = "512m"
     }
 }
 
diff --git a/room/room-guava/build.gradle b/room/room-guava/build.gradle
index 32dbc791..61c235a 100644
--- a/room/room-guava/build.gradle
+++ b/room/room-guava/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.room.guava"
+    namespace = "androidx.room.guava"
 }
diff --git a/room/room-ktx/build.gradle b/room/room-ktx/build.gradle
index 4a51b80..32d0dd6 100644
--- a/room/room-ktx/build.gradle
+++ b/room/room-ktx/build.gradle
@@ -54,5 +54,5 @@
 }
 
 android {
-    namespace "androidx.room.ktx"
+    namespace = "androidx.room.ktx"
 }
diff --git a/room/room-paging-guava/build.gradle b/room/room-paging-guava/build.gradle
index 68e5f03..73a8396 100644
--- a/room/room-paging-guava/build.gradle
+++ b/room/room-paging-guava/build.gradle
@@ -58,5 +58,5 @@
 }
 
 android {
-    namespace "androidx.room.paging.guava"
+    namespace = "androidx.room.paging.guava"
 }
diff --git a/room/room-paging-rxjava2/build.gradle b/room/room-paging-rxjava2/build.gradle
index 0189e99..0667973 100644
--- a/room/room-paging-rxjava2/build.gradle
+++ b/room/room-paging-rxjava2/build.gradle
@@ -57,5 +57,5 @@
 }
 
 android {
-    namespace "androidx.room.paging.rxjava2"
+    namespace = "androidx.room.paging.rxjava2"
 }
diff --git a/room/room-paging-rxjava3/build.gradle b/room/room-paging-rxjava3/build.gradle
index 0d692e4..350eea0 100644
--- a/room/room-paging-rxjava3/build.gradle
+++ b/room/room-paging-rxjava3/build.gradle
@@ -57,5 +57,5 @@
 }
 
 android {
-    namespace "androidx.room.paging.rxjava3"
+    namespace = "androidx.room.paging.rxjava3"
 }
diff --git a/room/room-paging/build.gradle b/room/room-paging/build.gradle
index 0cc224b..b73c895 100644
--- a/room/room-paging/build.gradle
+++ b/room/room-paging/build.gradle
@@ -90,7 +90,7 @@
 }
 
 android {
-    namespace "androidx.room.paging"
+    namespace = "androidx.room.paging"
 }
 
 dependencies {
diff --git a/room/room-runtime/build.gradle b/room/room-runtime/build.gradle
index dd9b1da..4444a4c 100644
--- a/room/room-runtime/build.gradle
+++ b/room/room-runtime/build.gradle
@@ -58,12 +58,12 @@
         aidl = true
     }
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
         stableAidl {
-            version 1
+            version = 1
         }
     }
-    namespace "androidx.room"
+    namespace = "androidx.room"
     // TODO(b/345531033)
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/room/room-rxjava2/build.gradle b/room/room-rxjava2/build.gradle
index 2b23d3f..96dc8c9 100644
--- a/room/room-rxjava2/build.gradle
+++ b/room/room-rxjava2/build.gradle
@@ -55,5 +55,5 @@
 }
 
 android {
-    namespace "androidx.room.rxjava2"
+    namespace = "androidx.room.rxjava2"
 }
diff --git a/room/room-rxjava3/build.gradle b/room/room-rxjava3/build.gradle
index 96c86a1..de7e28d 100644
--- a/room/room-rxjava3/build.gradle
+++ b/room/room-rxjava3/build.gradle
@@ -55,5 +55,5 @@
 }
 
 android {
-    namespace "androidx.room.rxjava3"
+    namespace = "androidx.room.rxjava3"
 }
diff --git a/safeparcel/safeparcel/build.gradle b/safeparcel/safeparcel/build.gradle
index 2eb2e7f..e79b4aa 100644
--- a/safeparcel/safeparcel/build.gradle
+++ b/safeparcel/safeparcel/build.gradle
@@ -34,7 +34,7 @@
 }
 
 android {
-    namespace "androidx.safeparcel"
+    namespace = "androidx.safeparcel"
 }
 
 androidx {
diff --git a/samples/AndroidXDemos/build.gradle b/samples/AndroidXDemos/build.gradle
index 29e79a8..f9b197a 100644
--- a/samples/AndroidXDemos/build.gradle
+++ b/samples/AndroidXDemos/build.gradle
@@ -42,14 +42,12 @@
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
     }
     lintOptions {
         disable "WrongThread"
-        // TODO: Enable lint after appcompat:1.1.0 release or use lint-baseline.xml instead.
-        abortOnError false
     }
-    namespace "com.example.androidx"
+    namespace = "com.example.androidx"
 }
diff --git a/samples/MediaRoutingDemo/build.gradle b/samples/MediaRoutingDemo/build.gradle
index 7a56a07..1b2b054 100644
--- a/samples/MediaRoutingDemo/build.gradle
+++ b/samples/MediaRoutingDemo/build.gradle
@@ -30,12 +30,12 @@
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
     }
     lint {
         baseline = file("lint-baseline.xml")
     }
-    namespace "com.example.androidx.mediarouting"
+    namespace = "com.example.androidx.mediarouting"
 }
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index 76947e2..e03d966 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -31,6 +31,6 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "com.example.android.supportv4"
+    compileSdk = 35
+    namespace = "com.example.android.supportv4"
 }
diff --git a/samples/SupportAnimationDemos/build.gradle b/samples/SupportAnimationDemos/build.gradle
index 24ef997..e117314 100644
--- a/samples/SupportAnimationDemos/build.gradle
+++ b/samples/SupportAnimationDemos/build.gradle
@@ -16,6 +16,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "com.example.android.support.animation"
+    compileSdk = 35
+    namespace = "com.example.android.support.animation"
 }
diff --git a/samples/SupportContentDemos/build.gradle b/samples/SupportContentDemos/build.gradle
index b362f39..436e62b 100644
--- a/samples/SupportContentDemos/build.gradle
+++ b/samples/SupportContentDemos/build.gradle
@@ -32,6 +32,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "com.example.android.support.content.demos"
+    compileSdk = 35
+    namespace = "com.example.android.support.content.demos"
 }
diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle
index edbbcaf..c2d792a 100644
--- a/samples/SupportEmojiDemos/build.gradle
+++ b/samples/SupportEmojiDemos/build.gradle
@@ -33,9 +33,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     sourceSets {
         main.assets.srcDirs = [new File(fontDir, "supported-emojis").getAbsolutePath()]
     }
-    namespace "com.example.android.support.text.emoji"
+    namespace = "com.example.android.support.text.emoji"
 }
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle
index 0ee2873..5fb21ae 100644
--- a/samples/SupportLeanbackDemos/build.gradle
+++ b/samples/SupportLeanbackDemos/build.gradle
@@ -26,6 +26,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "com.example.android.leanback"
+    compileSdk = 35
+    namespace = "com.example.android.leanback"
 }
diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle
index df46fbd..15c8310 100644
--- a/samples/SupportPreferenceDemos/build.gradle
+++ b/samples/SupportPreferenceDemos/build.gradle
@@ -27,6 +27,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "com.example.androidx.preference"
+    compileSdk = 35
+    namespace = "com.example.androidx.preference"
 }
diff --git a/samples/SupportRemoteCallbackDemos/build.gradle b/samples/SupportRemoteCallbackDemos/build.gradle
index 7876ec4..224e04d 100644
--- a/samples/SupportRemoteCallbackDemos/build.gradle
+++ b/samples/SupportRemoteCallbackDemos/build.gradle
@@ -27,8 +27,8 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
     }
-    namespace "com.example.androidx.remotecallback.demos"
+    namespace = "com.example.androidx.remotecallback.demos"
 }
diff --git a/samples/SupportSliceDemos/build.gradle b/samples/SupportSliceDemos/build.gradle
index ecc6585..8b3c774 100644
--- a/samples/SupportSliceDemos/build.gradle
+++ b/samples/SupportSliceDemos/build.gradle
@@ -33,8 +33,8 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
     }
-    namespace "com.example.androidx.slice.demos"
+    namespace = "com.example.androidx.slice.demos"
 }
diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle
index 53f1d45..46f73ab 100644
--- a/samples/SupportTransitionDemos/build.gradle
+++ b/samples/SupportTransitionDemos/build.gradle
@@ -22,7 +22,7 @@
     aaptOptions {
         additionalParameters "--no-version-transitions"
     }
-    compileSdk 35
-    namespace "com.example.android.support.transition"
+    compileSdk = 35
+    namespace = "com.example.android.support.transition"
 }
 
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle
index a1dee90..fb66943 100644
--- a/samples/SupportWearDemos/build.gradle
+++ b/samples/SupportWearDemos/build.gradle
@@ -28,9 +28,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
-    namespace "com.example.android.support.wear"
+    namespace = "com.example.android.support.wear"
 }
diff --git a/savedstate/savedstate-compose/build.gradle b/savedstate/savedstate-compose/build.gradle
index 4895f55..fcb5297 100644
--- a/savedstate/savedstate-compose/build.gradle
+++ b/savedstate/savedstate-compose/build.gradle
@@ -89,7 +89,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.savedstate.compose"
+    namespace = "androidx.savedstate.compose"
     experimentalProperties["android.lint.useK2Uast"] = false // TODO(b/345531033)
 }
 
diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle
index a67dc60..2e7f471 100644
--- a/savedstate/savedstate-ktx/build.gradle
+++ b/savedstate/savedstate-ktx/build.gradle
@@ -50,5 +50,5 @@
 }
 
 android {
-    namespace "androidx.savedstate.ktx"
+    namespace = "androidx.savedstate.ktx"
 }
diff --git a/savedstate/savedstate-samples/build.gradle b/savedstate/savedstate-samples/build.gradle
index e8dc6dc..755c5c0 100644
--- a/savedstate/savedstate-samples/build.gradle
+++ b/savedstate/savedstate-samples/build.gradle
@@ -41,8 +41,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.savedstate.samples"
+    compileSdk = 35
+    namespace = "androidx.savedstate.samples"
 }
 
 androidx {
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
index a333403..91ce8e0 100644
--- a/savedstate/savedstate/build.gradle
+++ b/savedstate/savedstate/build.gradle
@@ -164,7 +164,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.savedstate"
+    namespace = "androidx.savedstate"
     experimentalProperties["android.lint.useK2Uast"] = false // TODO(b/345531033)
 }
 
diff --git a/security/security-app-authenticator-testing/build.gradle b/security/security-app-authenticator-testing/build.gradle
index 3599ad9..fa96930 100644
--- a/security/security-app-authenticator-testing/build.gradle
+++ b/security/security-app-authenticator-testing/build.gradle
@@ -42,7 +42,7 @@
 
 android {
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.security.app.authenticator.testing"
+    namespace = "androidx.security.app.authenticator.testing"
 }
 
 androidx {
diff --git a/security/security-app-authenticator/build.gradle b/security/security-app-authenticator/build.gradle
index 3b36b65..55cceec 100644
--- a/security/security-app-authenticator/build.gradle
+++ b/security/security-app-authenticator/build.gradle
@@ -52,7 +52,7 @@
 
 android {
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.security.app.authenticator"
+    namespace = "androidx.security.app.authenticator"
 }
 
 androidx {
diff --git a/security/security-biometric/build.gradle b/security/security-biometric/build.gradle
index fc1c690..1b567e8 100644
--- a/security/security-biometric/build.gradle
+++ b/security/security-biometric/build.gradle
@@ -44,9 +44,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.security.biometric"
+    namespace = "androidx.security.biometric"
 }
 
 androidx {
diff --git a/security/security-crypto-ktx/build.gradle b/security/security-crypto-ktx/build.gradle
index fa3b8bf..0d5d546 100644
--- a/security/security-crypto-ktx/build.gradle
+++ b/security/security-crypto-ktx/build.gradle
@@ -42,7 +42,7 @@
 }
 
 android {
-    namespace "androidx.security.ktx"
+    namespace = "androidx.security.ktx"
 }
 
 androidx {
diff --git a/security/security-crypto/build.gradle b/security/security-crypto/build.gradle
index 6114d86..f274d2c 100644
--- a/security/security-crypto/build.gradle
+++ b/security/security-crypto/build.gradle
@@ -45,7 +45,7 @@
 }
 
 android {
-    namespace "androidx.security"
+    namespace = "androidx.security"
 }
 
 androidx {
diff --git a/security/security-identity-credential/build.gradle b/security/security-identity-credential/build.gradle
index 9857044..4a02e1a 100644
--- a/security/security-identity-credential/build.gradle
+++ b/security/security-identity-credential/build.gradle
@@ -47,9 +47,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
-    namespace "androidx.security.identity.credential"
+    namespace = "androidx.security.identity.credential"
 }
 
 androidx {
diff --git a/security/security-mls/build.gradle b/security/security-mls/build.gradle
index 1d899d2..f71e8e9 100644
--- a/security/security-mls/build.gradle
+++ b/security/security-mls/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    namespace "androidx.security.mls"
+    namespace = "androidx.security.mls"
 }
 
 androidx {
diff --git a/security/security-state-provider/build.gradle b/security/security-state-provider/build.gradle
index 74e5ba2..0eaf565 100644
--- a/security/security-state-provider/build.gradle
+++ b/security/security-state-provider/build.gradle
@@ -40,8 +40,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.security.state.provider"
+    compileSdk = 35
+    namespace = "androidx.security.state.provider"
 }
 
 androidx {
diff --git a/security/security-state/build.gradle b/security/security-state/build.gradle
index 027680e..264de58 100644
--- a/security/security-state/build.gradle
+++ b/security/security-state/build.gradle
@@ -54,8 +54,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.security.state"
+    compileSdk = 35
+    namespace = "androidx.security.state"
 }
 
 androidx {
diff --git a/sharetarget/integration-tests/testapp/build.gradle b/sharetarget/integration-tests/testapp/build.gradle
index a36f631..2035de9 100644
--- a/sharetarget/integration-tests/testapp/build.gradle
+++ b/sharetarget/integration-tests/testapp/build.gradle
@@ -27,5 +27,5 @@
 }
 
 android {
-    namespace "androidx.sharetarget.testapp"
+    namespace = "androidx.sharetarget.testapp"
 }
diff --git a/sharetarget/sharetarget/build.gradle b/sharetarget/sharetarget/build.gradle
index eb41cbe..87f27dc 100644
--- a/sharetarget/sharetarget/build.gradle
+++ b/sharetarget/sharetarget/build.gradle
@@ -54,5 +54,5 @@
         consumerProguardFiles "proguard-rules.pro"
     }
 
-    namespace "androidx.sharetarget"
+    namespace = "androidx.sharetarget"
 }
diff --git a/slice/slice-benchmark/build.gradle b/slice/slice-benchmark/build.gradle
index 650554f..fdf2c06 100644
--- a/slice/slice-benchmark/build.gradle
+++ b/slice/slice-benchmark/build.gradle
@@ -59,6 +59,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.slice.benchmark"
+    compileSdk = 35
+    namespace = "androidx.slice.benchmark"
 }
diff --git a/slice/slice-builders-ktx/build.gradle b/slice/slice-builders-ktx/build.gradle
index 2966d62..fa53c74 100644
--- a/slice/slice-builders-ktx/build.gradle
+++ b/slice/slice-builders-ktx/build.gradle
@@ -33,7 +33,7 @@
 android {
     defaultConfig {
     }
-    namespace "androidx.slice.builders.ktx"
+    namespace = "androidx.slice.builders.ktx"
 }
 
 dependencies {
diff --git a/slice/slice-builders/build.gradle b/slice/slice-builders/build.gradle
index f91ad72..df96839 100644
--- a/slice/slice-builders/build.gradle
+++ b/slice/slice-builders/build.gradle
@@ -53,5 +53,5 @@
 }
 
 android {
-    namespace "androidx.slice.builders"
+    namespace = "androidx.slice.builders"
 }
diff --git a/slice/slice-core/build.gradle b/slice/slice-core/build.gradle
index 9537bbb..9b5bfcf 100644
--- a/slice/slice-core/build.gradle
+++ b/slice/slice-core/build.gradle
@@ -59,5 +59,5 @@
 }
 
 android {
-    namespace "androidx.slice.core"
+    namespace = "androidx.slice.core"
 }
diff --git a/slice/slice-remotecallback/build.gradle b/slice/slice-remotecallback/build.gradle
index d726d05..fc40116 100644
--- a/slice/slice-remotecallback/build.gradle
+++ b/slice/slice-remotecallback/build.gradle
@@ -59,5 +59,5 @@
 }
 
 android {
-    namespace "androidx.slice.remotecallback"
+    namespace = "androidx.slice.remotecallback"
 }
diff --git a/slice/slice-test/build.gradle b/slice/slice-test/build.gradle
index 359130c..9832642 100644
--- a/slice/slice-test/build.gradle
+++ b/slice/slice-test/build.gradle
@@ -59,6 +59,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.slice.test"
+    compileSdk = 35
+    namespace = "androidx.slice.test"
 }
diff --git a/slice/slice-view/build.gradle b/slice/slice-view/build.gradle
index a0e0032..eb72d14 100644
--- a/slice/slice-view/build.gradle
+++ b/slice/slice-view/build.gradle
@@ -63,6 +63,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.slice.view"
+    compileSdk = 35
+    namespace = "androidx.slice.view"
 }
diff --git a/slidingpanelayout/slidingpanelayout-testapp/build.gradle b/slidingpanelayout/slidingpanelayout-testapp/build.gradle
index e1057d7..1b1fad9 100644
--- a/slidingpanelayout/slidingpanelayout-testapp/build.gradle
+++ b/slidingpanelayout/slidingpanelayout-testapp/build.gradle
@@ -37,7 +37,7 @@
 }
 
 android {
-    namespace "androidx.slidingpanelayout.demo"
+    namespace = "androidx.slidingpanelayout.demo"
 }
 
 androidx {
diff --git a/slidingpanelayout/slidingpanelayout/build.gradle b/slidingpanelayout/slidingpanelayout/build.gradle
index 5abae0d..9294813 100644
--- a/slidingpanelayout/slidingpanelayout/build.gradle
+++ b/slidingpanelayout/slidingpanelayout/build.gradle
@@ -38,5 +38,5 @@
 }
 
 android {
-    namespace "androidx.slidingpanelayout"
+    namespace = "androidx.slidingpanelayout"
 }
diff --git a/sqlite/integration-tests/inspection-room-testapp/build.gradle b/sqlite/integration-tests/inspection-room-testapp/build.gradle
index 0b991203..5463f5e1 100644
--- a/sqlite/integration-tests/inspection-room-testapp/build.gradle
+++ b/sqlite/integration-tests/inspection-room-testapp/build.gradle
@@ -39,7 +39,7 @@
 android {
     defaultConfig {
         // studio pipeline works only starting with Android O
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.sqlite.inspection.roomtestapp"
+    namespace = "androidx.sqlite.inspection.roomtestapp"
 }
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
index 9856bad..51e8033 100644
--- a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
+++ b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
@@ -41,7 +41,7 @@
     }
     defaultConfig {
         // studio pipeline works only starting with Android O
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.sqlite.inspection.sqldeligttestapp"
+    namespace = "androidx.sqlite.inspection.sqldeligttestapp"
 }
diff --git a/sqlite/sqlite-bundled/build.gradle b/sqlite/sqlite-bundled/build.gradle
index 841bedb..9fbba67 100644
--- a/sqlite/sqlite-bundled/build.gradle
+++ b/sqlite/sqlite-bundled/build.gradle
@@ -241,7 +241,7 @@
 }
 
 android {
-    namespace "androidx.sqlite.driver.bundled"
+    namespace = "androidx.sqlite.driver.bundled"
 }
 
 androidx {
diff --git a/sqlite/sqlite-inspection/build.gradle b/sqlite/sqlite-inspection/build.gradle
index 4cc8b06..8a64e1f 100644
--- a/sqlite/sqlite-inspection/build.gradle
+++ b/sqlite/sqlite-inspection/build.gradle
@@ -56,10 +56,10 @@
 android {
     defaultConfig {
         // studio pipeline works only starting with Android O
-        minSdkVersion 26
+        minSdk = 26
     }
     sourceSets {
         main.resources.srcDirs += "src/main/proto"
     }
-    namespace "androidx.sqlite.inspection"
+    namespace = "androidx.sqlite.inspection"
 }
diff --git a/sqlite/sqlite-ktx/build.gradle b/sqlite/sqlite-ktx/build.gradle
index 90d69c5..14472fc 100644
--- a/sqlite/sqlite-ktx/build.gradle
+++ b/sqlite/sqlite-ktx/build.gradle
@@ -45,5 +45,5 @@
 }
 
 android {
-    namespace "androidx.sqlite.db.ktx"
+    namespace = "androidx.sqlite.db.ktx"
 }
diff --git a/startup/integration-tests/first-library/build.gradle b/startup/integration-tests/first-library/build.gradle
index 75c7de1..e1fa036 100644
--- a/startup/integration-tests/first-library/build.gradle
+++ b/startup/integration-tests/first-library/build.gradle
@@ -35,6 +35,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.startup.first_library"
+    compileSdk = 35
+    namespace = "androidx.startup.first_library"
 }
diff --git a/startup/integration-tests/second-library/build.gradle b/startup/integration-tests/second-library/build.gradle
index c9c6ced..055ead9 100644
--- a/startup/integration-tests/second-library/build.gradle
+++ b/startup/integration-tests/second-library/build.gradle
@@ -34,6 +34,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.startup.second_library"
+    compileSdk = 35
+    namespace = "androidx.startup.second_library"
 }
diff --git a/startup/integration-tests/test-app/build.gradle b/startup/integration-tests/test-app/build.gradle
index f7893ef..d8e3033 100644
--- a/startup/integration-tests/test-app/build.gradle
+++ b/startup/integration-tests/test-app/build.gradle
@@ -21,13 +21,13 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     buildTypes {
         getByName("release") {
             minifyEnabled = true
         }
     }
-    namespace "androidx.startup.testapp"
+    namespace = "androidx.startup.testapp"
 }
 
 dependencies {
diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle
index 36cc9341..cacf253e 100644
--- a/startup/startup-runtime/build.gradle
+++ b/startup/startup-runtime/build.gradle
@@ -33,7 +33,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.startup"
+    namespace = "androidx.startup"
 }
 
 dependencies {
diff --git a/swiperefreshlayout/swiperefreshlayout/build.gradle b/swiperefreshlayout/swiperefreshlayout/build.gradle
index e5c567e..2b90c6a 100644
--- a/swiperefreshlayout/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/swiperefreshlayout/build.gradle
@@ -44,6 +44,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.swiperefreshlayout"
+    compileSdk = 35
+    namespace = "androidx.swiperefreshlayout"
 }
diff --git a/test/ext/junit-gtest/build.gradle b/test/ext/junit-gtest/build.gradle
index 4ba6ae5..3379957 100644
--- a/test/ext/junit-gtest/build.gradle
+++ b/test/ext/junit-gtest/build.gradle
@@ -64,7 +64,7 @@
     }
     externalNativeBuild {
         cmake {
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
             path "src/main/cpp/CMakeLists.txt"
         }
         experimentalProperties["prefab.junit-gtest.exportLibraries"] = [
@@ -76,15 +76,15 @@
 
     buildFeatures {
         prefab = true
-        prefabPublishing true
+        prefabPublishing = true
     }
 
     prefab {
         junitgtest {
-            name "junit-gtest"
+            name = "junit-gtest"
         }
     }
-    namespace "androidx.test.ext.junitgtest"
+    namespace = "androidx.test.ext.junitgtest"
 
     packagingOptions {
         jniLibs {
diff --git a/test/integration-tests/junit-gtest-test/build.gradle b/test/integration-tests/junit-gtest-test/build.gradle
index e725660..ad9c3e2 100644
--- a/test/integration-tests/junit-gtest-test/build.gradle
+++ b/test/integration-tests/junit-gtest-test/build.gradle
@@ -54,7 +54,7 @@
     }
     externalNativeBuild {
         cmake {
-            version libs.versions.cmake.get()
+            version = libs.versions.cmake.get()
             path "src/main/cpp/CMakeLists.txt"
         }
     }
@@ -62,6 +62,6 @@
     buildFeatures {
         prefab = true
     }
-    namespace "androidx.test.ext.junitgtesttest"
+    namespace = "androidx.test.ext.junitgtesttest"
 }
 
diff --git a/test/screenshot/screenshot/build.gradle b/test/screenshot/screenshot/build.gradle
index 89e9f33..e46a68c 100644
--- a/test/screenshot/screenshot/build.gradle
+++ b/test/screenshot/screenshot/build.gradle
@@ -59,5 +59,5 @@
 }
 
 android {
-    namespace "androidx.test.screenshot"
+    namespace = "androidx.test.screenshot"
 }
diff --git a/test/uiautomator/integration-tests/testapp/build.gradle b/test/uiautomator/integration-tests/testapp/build.gradle
index 21046a8..3f4be03 100644
--- a/test/uiautomator/integration-tests/testapp/build.gradle
+++ b/test/uiautomator/integration-tests/testapp/build.gradle
@@ -51,6 +51,6 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "androidx.test.uiautomator.testapp"
+    compileSdk = 35
+    namespace = "androidx.test.uiautomator.testapp"
 }
diff --git a/test/uiautomator/uiautomator/build.gradle b/test/uiautomator/uiautomator/build.gradle
index adaa08da..315f611 100644
--- a/test/uiautomator/uiautomator/build.gradle
+++ b/test/uiautomator/uiautomator/build.gradle
@@ -47,7 +47,7 @@
     useLibrary "android.test.runner"
     useLibrary "android.test.base"
     useLibrary "android.test.mock"
-    namespace "androidx.test.uiautomator"
+    namespace = "androidx.test.uiautomator"
 }
 
 androidx {
diff --git a/testutils/testutils-appcompat/build.gradle b/testutils/testutils-appcompat/build.gradle
index 5c26d7f..702f43f 100644
--- a/testutils/testutils-appcompat/build.gradle
+++ b/testutils/testutils-appcompat/build.gradle
@@ -44,7 +44,7 @@
     lintOptions {
         disable "InvalidPackage" // Lint is unhappy about junit package
     }
-    namespace "androidx.testutils.appcompat"
+    namespace = "androidx.testutils.appcompat"
 }
 
 androidx {
diff --git a/testutils/testutils-espresso/build.gradle b/testutils/testutils-espresso/build.gradle
index 1e0f813..7aa2e4c 100644
--- a/testutils/testutils-espresso/build.gradle
+++ b/testutils/testutils-espresso/build.gradle
@@ -41,7 +41,7 @@
     lintOptions {
         disable "InvalidPackage" // Lint is unhappy about junit package
     }
-    namespace "androidx.testutils.espresso"
+    namespace = "androidx.testutils.espresso"
 }
 
 androidx {
diff --git a/testutils/testutils-fonts/build.gradle b/testutils/testutils-fonts/build.gradle
index 66aba23..ea4956b 100644
--- a/testutils/testutils-fonts/build.gradle
+++ b/testutils/testutils-fonts/build.gradle
@@ -53,5 +53,5 @@
 }
 
 android {
-    namespace "androidx.testutils.fonts"
+    namespace = "androidx.testutils.fonts"
 }
diff --git a/testutils/testutils-macrobenchmark/build.gradle b/testutils/testutils-macrobenchmark/build.gradle
index e07a748..0cc739e 100644
--- a/testutils/testutils-macrobenchmark/build.gradle
+++ b/testutils/testutils-macrobenchmark/build.gradle
@@ -38,9 +38,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.testutils.macrobenchmark"
+    namespace = "androidx.testutils.macrobenchmark"
 }
 
 androidx {
diff --git a/testutils/testutils-mockito/build.gradle b/testutils/testutils-mockito/build.gradle
index 8550ce9..174351dc 100644
--- a/testutils/testutils-mockito/build.gradle
+++ b/testutils/testutils-mockito/build.gradle
@@ -39,7 +39,7 @@
     lintOptions {
         disable "InvalidPackage" // Lint is unhappy about java.lang.instrument package
     }
-    namespace "androidx.testutils.mockito"
+    namespace = "androidx.testutils.mockito"
 }
 
 androidx {
diff --git a/testutils/testutils-navigation/build.gradle b/testutils/testutils-navigation/build.gradle
index 52271cd..f691639 100644
--- a/testutils/testutils-navigation/build.gradle
+++ b/testutils/testutils-navigation/build.gradle
@@ -52,5 +52,5 @@
 }
 
 android {
-    namespace "androidx.testutils.navigation"
+    namespace = "androidx.testutils.navigation"
 }
diff --git a/testutils/testutils-runtime/build.gradle b/testutils/testutils-runtime/build.gradle
index 4d4ce3b..dabb929 100644
--- a/testutils/testutils-runtime/build.gradle
+++ b/testutils/testutils-runtime/build.gradle
@@ -45,7 +45,7 @@
     defaultConfig {
         testInstrumentationRunner "androidx.testutils.ActivityRecyclingAndroidJUnitRunner"
     }
-    namespace "androidx.testutils.runtime"
+    namespace = "androidx.testutils.runtime"
 }
 
 androidx {
diff --git a/tracing/tracing-ktx/build.gradle b/tracing/tracing-ktx/build.gradle
index 7fa130f..d5a4e9e 100644
--- a/tracing/tracing-ktx/build.gradle
+++ b/tracing/tracing-ktx/build.gradle
@@ -42,5 +42,5 @@
 }
 
 android {
-    namespace "androidx.tracing.ktx"
+    namespace = "androidx.tracing.ktx"
 }
diff --git a/tracing/tracing-perfetto-binary/build.gradle b/tracing/tracing-perfetto-binary/build.gradle
index 13a4627..ca53ce40 100644
--- a/tracing/tracing-perfetto-binary/build.gradle
+++ b/tracing/tracing-perfetto-binary/build.gradle
@@ -74,11 +74,11 @@
         externalNativeBuild {
             cmake {
                 path "src/main/cpp/CMakeLists.txt"
-                version libs.versions.cmake.get()
+                version = libs.versions.cmake.get()
             }
         }
     }
-    namespace "androidx.tracing.perfetto.binary"
+    namespace = "androidx.tracing.perfetto.binary"
 }
 
 dependencies {
diff --git a/tracing/tracing-perfetto/build.gradle b/tracing/tracing-perfetto/build.gradle
index 3305615..58fdfe1 100644
--- a/tracing/tracing-perfetto/build.gradle
+++ b/tracing/tracing-perfetto/build.gradle
@@ -79,5 +79,5 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.tracing.perfetto"
+    namespace = "androidx.tracing.perfetto"
 }
diff --git a/tracing/tracing/build.gradle b/tracing/tracing/build.gradle
index 86ba996..fbddd1e1 100644
--- a/tracing/tracing/build.gradle
+++ b/tracing/tracing/build.gradle
@@ -50,5 +50,5 @@
 }
 
 android {
-    namespace "androidx.tracing"
+    namespace = "androidx.tracing"
 }
diff --git a/transition/transition-ktx/build.gradle b/transition/transition-ktx/build.gradle
index 7f2bb69..d81b52e 100644
--- a/transition/transition-ktx/build.gradle
+++ b/transition/transition-ktx/build.gradle
@@ -48,6 +48,6 @@
 }
 
 android {
-    namespace "androidx.transition.ktx"
-    compileSdk 35
+    namespace = "androidx.transition.ktx"
+    compileSdk = 35
 }
diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle
index 769d2b6..88e6d8d 100644
--- a/transition/transition/build.gradle
+++ b/transition/transition/build.gradle
@@ -40,14 +40,14 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
     aaptOptions {
         additionalParameters "--no-version-transitions"
     }
-    namespace "androidx.transition"
+    namespace = "androidx.transition"
 }
 
 androidx {
diff --git a/tv/integration-tests/macrobenchmark-target/build.gradle b/tv/integration-tests/macrobenchmark-target/build.gradle
index a4670ee2..ed374ee 100644
--- a/tv/integration-tests/macrobenchmark-target/build.gradle
+++ b/tv/integration-tests/macrobenchmark-target/build.gradle
@@ -22,18 +22,18 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.tv.integration.macrobenchmark.target"
+    namespace = "androidx.tv.integration.macrobenchmark.target"
 
     defaultConfig {
-        minSdkVersion 28
+        minSdk = 28
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro"
         }
diff --git a/tv/integration-tests/macrobenchmark/build.gradle b/tv/integration-tests/macrobenchmark/build.gradle
index 48ac590..4a85792 100644
--- a/tv/integration-tests/macrobenchmark/build.gradle
+++ b/tv/integration-tests/macrobenchmark/build.gradle
@@ -21,10 +21,10 @@
 }
 
 android {
-    namespace "androidx.tv.integration.macrobenchmark"
+    namespace = "androidx.tv.integration.macrobenchmark"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 
     buildTypes {
diff --git a/tv/integration-tests/playground/build.gradle b/tv/integration-tests/playground/build.gradle
index 0d4877d..94dee82 100644
--- a/tv/integration-tests/playground/build.gradle
+++ b/tv/integration-tests/playground/build.gradle
@@ -43,18 +43,17 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 28
+        minSdk = 28
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
-            signingConfig signingConfigs.debug
         }
     }
-    namespace "androidx.tv.integration.playground"
+    namespace = "androidx.tv.integration.playground"
 }
diff --git a/tv/tv-foundation/build.gradle b/tv/tv-foundation/build.gradle
index c2bfe40..86b488ff 100644
--- a/tv/tv-foundation/build.gradle
+++ b/tv/tv-foundation/build.gradle
@@ -60,8 +60,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.tv.foundation"
+    compileSdk = 35
+    namespace = "androidx.tv.foundation"
 }
 
 androidx {
diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle
index f5ae584..a4d04af 100644
--- a/tv/tv-material/build.gradle
+++ b/tv/tv-material/build.gradle
@@ -61,8 +61,8 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.tv.material"
+    compileSdk = 35
+    namespace = "androidx.tv.material"
     sourceSets.androidTest.assets.srcDirs +=
              project.rootDir.absolutePath + "/../../golden/tv/compose/material3"
 }
diff --git a/tv/tv-material/samples/build.gradle b/tv/tv-material/samples/build.gradle
index acfcca2..a80f941 100644
--- a/tv/tv-material/samples/build.gradle
+++ b/tv/tv-material/samples/build.gradle
@@ -47,9 +47,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 28
+        minSdk = 28
     }
-    namespace "androidx.tv.material3.samples"
+    namespace = "androidx.tv.material3.samples"
 }
diff --git a/tvprovider/tvprovider/build.gradle b/tvprovider/tvprovider/build.gradle
index d37fd1b..de27577 100644
--- a/tvprovider/tvprovider/build.gradle
+++ b/tvprovider/tvprovider/build.gradle
@@ -24,7 +24,7 @@
 }
 
 android {
-    namespace "androidx.tvprovider"
+    namespace = "androidx.tvprovider"
 }
 
 androidx {
diff --git a/vectordrawable/integration-tests/testapp/build.gradle b/vectordrawable/integration-tests/testapp/build.gradle
index d124c31..1725a8e7 100644
--- a/vectordrawable/integration-tests/testapp/build.gradle
+++ b/vectordrawable/integration-tests/testapp/build.gradle
@@ -29,10 +29,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
     }
-    namespace "com.example.android.support.vectordrawable"
+    namespace = "com.example.android.support.vectordrawable"
 }
 
diff --git a/vectordrawable/vectordrawable-animated/build.gradle b/vectordrawable/vectordrawable-animated/build.gradle
index 4c3cfa9..0be619c 100644
--- a/vectordrawable/vectordrawable-animated/build.gradle
+++ b/vectordrawable/vectordrawable-animated/build.gradle
@@ -38,7 +38,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.vectordrawable.animated"
+    namespace = "androidx.vectordrawable.animated"
 }
 
 androidx {
diff --git a/vectordrawable/vectordrawable-seekable/build.gradle b/vectordrawable/vectordrawable-seekable/build.gradle
index 5001fa7..5ad61c7 100644
--- a/vectordrawable/vectordrawable-seekable/build.gradle
+++ b/vectordrawable/vectordrawable-seekable/build.gradle
@@ -40,7 +40,7 @@
     aaptOptions {
         additionalParameters("--no-version-vectors")
     }
-    namespace "androidx.vectordrawable.seekable"
+    namespace = "androidx.vectordrawable.seekable"
 }
 
 androidx {
diff --git a/vectordrawable/vectordrawable/build.gradle b/vectordrawable/vectordrawable/build.gradle
index 75b1aa2..702b1ef7 100644
--- a/vectordrawable/vectordrawable/build.gradle
+++ b/vectordrawable/vectordrawable/build.gradle
@@ -32,7 +32,7 @@
     aaptOptions {
         additionalParameters "--no-version-vectors"
     }
-    namespace "androidx.vectordrawable"
+    namespace = "androidx.vectordrawable"
 }
 
 androidx {
diff --git a/versionedparcelable/versionedparcelable/build.gradle b/versionedparcelable/versionedparcelable/build.gradle
index a639726..83adae3 100644
--- a/versionedparcelable/versionedparcelable/build.gradle
+++ b/versionedparcelable/versionedparcelable/build.gradle
@@ -51,10 +51,10 @@
         consumerProguardFiles("proguard-rules.pro")
 
         stableAidl {
-            version 1
+            version = 1
         }
     }
-    namespace "androidx.versionedparcelable"
+    namespace = "androidx.versionedparcelable"
 }
 
 androidx {
diff --git a/viewpager/viewpager/build.gradle b/viewpager/viewpager/build.gradle
index 2b61638..4dece8c 100644
--- a/viewpager/viewpager/build.gradle
+++ b/viewpager/viewpager/build.gradle
@@ -36,5 +36,5 @@
 }
 
 android {
-    namespace "androidx.viewpager"
+    namespace = "androidx.viewpager"
 }
diff --git a/viewpager2/integration-tests/targetsdk-tests/build.gradle b/viewpager2/integration-tests/targetsdk-tests/build.gradle
index 017417e..451518d 100644
--- a/viewpager2/integration-tests/targetsdk-tests/build.gradle
+++ b/viewpager2/integration-tests/targetsdk-tests/build.gradle
@@ -21,7 +21,7 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     flavorDimensions = ["targetSdk"]
     productFlavors {
         targetSdk29 {
@@ -35,7 +35,7 @@
             // Default is set to latest
         }
     }
-    namespace "androidx.viewpager2.integration.targestsdktests"
+    namespace = "androidx.viewpager2.integration.targestsdktests"
 }
 
 androidComponents {
diff --git a/viewpager2/integration-tests/testapp/build.gradle b/viewpager2/integration-tests/testapp/build.gradle
index ff23ca5..451e48e 100644
--- a/viewpager2/integration-tests/testapp/build.gradle
+++ b/viewpager2/integration-tests/testapp/build.gradle
@@ -42,6 +42,6 @@
 }
 
 android {
-    compileSdkVersion 35
-    namespace "androidx.viewpager2.integration.testapp"
+    compileSdk = 35
+    namespace = "androidx.viewpager2.integration.testapp"
 }
diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle
index 84bcb51..b541e5b 100644
--- a/viewpager2/viewpager2/build.gradle
+++ b/viewpager2/viewpager2/build.gradle
@@ -66,5 +66,5 @@
 }
 
 android {
-    namespace "androidx.viewpager2"
+    namespace = "androidx.viewpager2"
 }
diff --git a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
index 091eb148..4654575 100644
--- a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -21,19 +21,19 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        minSdk 28
+        minSdk = 28
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    namespace "androidx.wear.benchmark.integration.macrobenchmark.target"
+    namespace = "androidx.wear.benchmark.integration.macrobenchmark.target"
 }
 
 dependencies {
diff --git a/wear/benchmark/integration-tests/macrobenchmark/build.gradle b/wear/benchmark/integration-tests/macrobenchmark/build.gradle
index e7fc8f1..ef9296d 100644
--- a/wear/benchmark/integration-tests/macrobenchmark/build.gradle
+++ b/wear/benchmark/integration-tests/macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 29
+        minSdk = 29
     }
-    namespace "androidx.wear.benchmark.integration.macrobenchmark"
+    namespace = "androidx.wear.benchmark.integration.macrobenchmark"
     targetProjectPath = ":wear:benchmark:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/wear/compose/compose-foundation/benchmark/build.gradle b/wear/compose/compose-foundation/benchmark/build.gradle
index 4b50741..2cdab7f 100644
--- a/wear/compose/compose-foundation/benchmark/build.gradle
+++ b/wear/compose/compose-foundation/benchmark/build.gradle
@@ -32,15 +32,15 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     buildTypes.configureEach {
         consumerProguardFiles "benchmark-proguard-rules.pro"
     }
-    namespace "androidx.wear.compose.foundation.benchmark"
+    namespace = "androidx.wear.compose.foundation.benchmark"
 }
 
 dependencies {
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index b3b30fb..283e791 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -72,9 +72,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
@@ -84,7 +84,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.wear.compose.foundation"
+    namespace = "androidx.wear.compose.foundation"
 }
 
 androidx {
diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle
index e1e59d9..ba78d91 100644
--- a/wear/compose/compose-foundation/samples/build.gradle
+++ b/wear/compose/compose-foundation/samples/build.gradle
@@ -47,12 +47,12 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.compose.foundation.samples"
+    namespace = "androidx.wear.compose.foundation.samples"
 }
 
 androidx {
diff --git a/wear/compose/compose-material-core/build.gradle b/wear/compose/compose-material-core/build.gradle
index 7e8b1cc..bc7615d 100644
--- a/wear/compose/compose-material-core/build.gradle
+++ b/wear/compose/compose-material-core/build.gradle
@@ -59,10 +59,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
@@ -71,7 +71,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.wear.compose.material.core"
+    namespace = "androidx.wear.compose.material.core"
 }
 
 androidx {
diff --git a/wear/compose/compose-material/benchmark/build.gradle b/wear/compose/compose-material/benchmark/build.gradle
index 7cd3eb5..77ff797 100644
--- a/wear/compose/compose-material/benchmark/build.gradle
+++ b/wear/compose/compose-material/benchmark/build.gradle
@@ -32,15 +32,15 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     buildTypes.configureEach {
         consumerProguardFiles "benchmark-proguard-rules.pro"
     }
-    namespace "androidx.wear.compose.material.benchmark"
+    namespace = "androidx.wear.compose.material.benchmark"
 }
 
 dependencies {
diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle
index 8ecf232..d09f201 100644
--- a/wear/compose/compose-material/build.gradle
+++ b/wear/compose/compose-material/build.gradle
@@ -61,10 +61,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
@@ -73,7 +73,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.wear.compose.material"
+    namespace = "androidx.wear.compose.material"
     lint {
         baseline = file("lint-baseline.xml")
     }
diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle
index 5850a2d..f892f25 100644
--- a/wear/compose/compose-material/samples/build.gradle
+++ b/wear/compose/compose-material/samples/build.gradle
@@ -56,12 +56,12 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.compose.material.samples"
+    namespace = "androidx.wear.compose.material.samples"
 }
 
 androidx {
diff --git a/wear/compose/compose-material3/benchmark/build.gradle b/wear/compose/compose-material3/benchmark/build.gradle
index 092e595..ae72baf 100644
--- a/wear/compose/compose-material3/benchmark/build.gradle
+++ b/wear/compose/compose-material3/benchmark/build.gradle
@@ -32,15 +32,15 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     buildTypes.configureEach {
         consumerProguardFiles "benchmark-proguard-rules.pro"
     }
-    namespace "androidx.wear.compose.material3.benchmark"
+    namespace = "androidx.wear.compose.material3.benchmark"
 }
 
 dependencies {
diff --git a/wear/compose/compose-material3/build.gradle b/wear/compose/compose-material3/build.gradle
index 21ce993..efbb530a 100644
--- a/wear/compose/compose-material3/build.gradle
+++ b/wear/compose/compose-material3/build.gradle
@@ -69,10 +69,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
@@ -81,7 +81,7 @@
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.wear.compose.material3"
+    namespace = "androidx.wear.compose.material3"
     lint {
         baseline = file("lint-baseline.xml")
     }
diff --git a/wear/compose/compose-material3/integration-tests/build.gradle b/wear/compose/compose-material3/integration-tests/build.gradle
index c97b609..2f58f12 100644
--- a/wear/compose/compose-material3/integration-tests/build.gradle
+++ b/wear/compose/compose-material3/integration-tests/build.gradle
@@ -53,9 +53,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.compose.material3.demos"
+    namespace = "androidx.wear.compose.material3.demos"
 }
diff --git a/wear/compose/compose-material3/macrobenchmark-common/build.gradle b/wear/compose/compose-material3/macrobenchmark-common/build.gradle
index 67dc9bb..7f81f7d 100644
--- a/wear/compose/compose-material3/macrobenchmark-common/build.gradle
+++ b/wear/compose/compose-material3/macrobenchmark-common/build.gradle
@@ -6,11 +6,11 @@
 }
 
 android {
-    namespace 'androidx.wear.compose.material3.macrobenchmark.common'
-    compileSdk 35
+    namespace = "androidx.wear.compose.material3.macrobenchmark.common"
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
 
     buildTypes.configureEach {
diff --git a/wear/compose/compose-material3/macrobenchmark-target/build.gradle b/wear/compose/compose-material3/macrobenchmark-target/build.gradle
index 242de82e..b615cb8 100644
--- a/wear/compose/compose-material3/macrobenchmark-target/build.gradle
+++ b/wear/compose/compose-material3/macrobenchmark-target/build.gradle
@@ -22,13 +22,13 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.wear.compose.material3.macrobenchmark.target"
+    namespace = "androidx.wear.compose.material3.macrobenchmark.target"
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'),
                     "proguard-benchmark.pro")
         }
@@ -45,4 +45,4 @@
     implementation(project(":wear:compose:compose-material3-macrobenchmark-common"))
 }
 
-android.defaultConfig.minSdkVersion 25
+android.defaultConfig.minSdk = 25
diff --git a/wear/compose/compose-material3/macrobenchmark/build.gradle b/wear/compose/compose-material3/macrobenchmark/build.gradle
index c140316..1940fef 100644
--- a/wear/compose/compose-material3/macrobenchmark/build.gradle
+++ b/wear/compose/compose-material3/macrobenchmark/build.gradle
@@ -21,11 +21,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 29
+        minSdk = 29
     }
-    namespace "androidx.wear.compose.material3.macrobenchmark"
+    namespace = "androidx.wear.compose.material3.macrobenchmark"
     targetProjectPath = ":wear:compose:compose-material3-macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/wear/compose/compose-material3/samples/build.gradle b/wear/compose/compose-material3/samples/build.gradle
index d113817..02e43d8 100644
--- a/wear/compose/compose-material3/samples/build.gradle
+++ b/wear/compose/compose-material3/samples/build.gradle
@@ -48,11 +48,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.compose.material3.samples"
+    namespace = "androidx.wear.compose.material3.samples"
 }
 
 androidx {
diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle
index 8273ef7..9597669 100644
--- a/wear/compose/compose-navigation/build.gradle
+++ b/wear/compose/compose-navigation/build.gradle
@@ -54,17 +54,17 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
     buildTypes.configureEach {
         consumerProguardFiles("proguard-rules.pro")
     }
-    namespace "androidx.wear.compose.navigation"
+    namespace = "androidx.wear.compose.navigation"
 }
 
 androidx {
diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle
index 3965eb9..484b69e 100644
--- a/wear/compose/compose-navigation/samples/build.gradle
+++ b/wear/compose/compose-navigation/samples/build.gradle
@@ -48,12 +48,12 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.compose.navigation.samples"
+    namespace = "androidx.wear.compose.navigation.samples"
 }
 
 androidx {
diff --git a/wear/compose/compose-ui-tooling/build.gradle b/wear/compose/compose-ui-tooling/build.gradle
index ab9f3dd..7d38d45 100644
--- a/wear/compose/compose-ui-tooling/build.gradle
+++ b/wear/compose/compose-ui-tooling/build.gradle
@@ -38,7 +38,7 @@
 }
 
 android {
-    namespace "androidx.wear.compose.ui.tooling"
+    namespace = "androidx.wear.compose.ui.tooling"
 }
 
 androidx {
diff --git a/wear/compose/integration-tests/demos/build.gradle b/wear/compose/integration-tests/demos/build.gradle
index ed69021..2004d28 100644
--- a/wear/compose/integration-tests/demos/build.gradle
+++ b/wear/compose/integration-tests/demos/build.gradle
@@ -22,25 +22,25 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.wear.compose.integration.demos"
-        minSdk 25
-        versionCode 57
-        versionName "1.57"
+        applicationId = "androidx.wear.compose.integration.demos"
+        minSdk = 25
+        versionCode = 57
+        versionName = "1.57"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.wear.compose.integration.demos"
+    namespace = "androidx.wear.compose.integration.demos"
 }
 
 dependencies {
diff --git a/wear/compose/integration-tests/demos/common/build.gradle b/wear/compose/integration-tests/demos/common/build.gradle
index 8f518ec..9cc7ba1 100644
--- a/wear/compose/integration-tests/demos/common/build.gradle
+++ b/wear/compose/integration-tests/demos/common/build.gradle
@@ -30,9 +30,9 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.compose.integration.demos.common"
+    namespace = "androidx.wear.compose.integration.demos.common"
 }
diff --git a/wear/compose/integration-tests/macrobenchmark-target/build.gradle b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
index fada269..0e41262 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -22,13 +22,13 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
-    namespace "androidx.wear.compose.integration.macrobenchmark.target"
+    namespace = "androidx.wear.compose.integration.macrobenchmark.target"
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'),
                     "proguard-benchmark.pro")
         }
@@ -53,4 +53,4 @@
     implementation(project(path:':tracing:tracing-perfetto-binary'))
 }
 
-android.defaultConfig.minSdkVersion 25
+android.defaultConfig.minSdk = 25
diff --git a/wear/compose/integration-tests/macrobenchmark/build.gradle b/wear/compose/integration-tests/macrobenchmark/build.gradle
index a56f32a..7407331 100644
--- a/wear/compose/integration-tests/macrobenchmark/build.gradle
+++ b/wear/compose/integration-tests/macrobenchmark/build.gradle
@@ -21,11 +21,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 29
+        minSdk = 29
     }
-    namespace "androidx.wear.compose.integration.macrobenchmark"
+    namespace = "androidx.wear.compose.integration.macrobenchmark"
     targetProjectPath = ":wear:compose:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/wear/compose/integration-tests/navigation/build.gradle b/wear/compose/integration-tests/navigation/build.gradle
index 5c1619c..f2d4444 100644
--- a/wear/compose/integration-tests/navigation/build.gradle
+++ b/wear/compose/integration-tests/navigation/build.gradle
@@ -22,22 +22,22 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.wear.compose.integration.navigation"
-        minSdk 25
+        applicationId = "androidx.wear.compose.integration.navigation"
+        minSdk = 25
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.wear.compose.integration.navigation"
+    namespace = "androidx.wear.compose.integration.navigation"
 }
 
 dependencies {
diff --git a/wear/protolayout/protolayout-expression-pipeline/build.gradle b/wear/protolayout/protolayout-expression-pipeline/build.gradle
index db0ef6e..8166472 100644
--- a/wear/protolayout/protolayout-expression-pipeline/build.gradle
+++ b/wear/protolayout/protolayout-expression-pipeline/build.gradle
@@ -49,10 +49,10 @@
 }
 
 android {
-    namespace "androidx.wear.protolayout.expression.pipeline"
+    namespace = "androidx.wear.protolayout.expression.pipeline"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 }
 
diff --git a/wear/protolayout/protolayout-expression/build.gradle b/wear/protolayout/protolayout-expression/build.gradle
index ca1d5f1..43587b2 100644
--- a/wear/protolayout/protolayout-expression/build.gradle
+++ b/wear/protolayout/protolayout-expression/build.gradle
@@ -51,10 +51,10 @@
 }
 
 android {
-    namespace "androidx.wear.protolayout.expression"
+    namespace = "androidx.wear.protolayout.expression"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
diff --git a/wear/protolayout/protolayout-material-core/build.gradle b/wear/protolayout/protolayout-material-core/build.gradle
index 996c22e..8a588b79 100644
--- a/wear/protolayout/protolayout-material-core/build.gradle
+++ b/wear/protolayout/protolayout-material-core/build.gradle
@@ -31,14 +31,9 @@
 
 android {
     defaultConfig {
-        minSdk 26
+        minSdk = 26
     }
-
-    defaultConfig {
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    namespace "androidx.wear.protolayout.materialcore"
+    namespace = "androidx.wear.protolayout.materialcore"
 }
 
 dependencies {
diff --git a/wear/protolayout/protolayout-material/build.gradle b/wear/protolayout/protolayout-material/build.gradle
index 4832ca7..e198277 100644
--- a/wear/protolayout/protolayout-material/build.gradle
+++ b/wear/protolayout/protolayout-material/build.gradle
@@ -65,7 +65,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     sourceSets {
@@ -76,7 +76,7 @@
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    namespace "androidx.wear.protolayout.material"
+    namespace = "androidx.wear.protolayout.material"
 }
 
 androidx {
diff --git a/wear/protolayout/protolayout-material3/build.gradle b/wear/protolayout/protolayout-material3/build.gradle
index e3ad015..5b35a1a 100644
--- a/wear/protolayout/protolayout-material3/build.gradle
+++ b/wear/protolayout/protolayout-material3/build.gradle
@@ -66,10 +66,10 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     sourceSets {
@@ -80,7 +80,7 @@
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    namespace "androidx.wear.protolayout.material3"
+    namespace = "androidx.wear.protolayout.material3"
     kotlinOptions {
         jvmTarget = '1.8'
     }
diff --git a/wear/protolayout/protolayout-material3/samples/build.gradle b/wear/protolayout/protolayout-material3/samples/build.gradle
index 2c20d75..e93ee23 100644
--- a/wear/protolayout/protolayout-material3/samples/build.gradle
+++ b/wear/protolayout/protolayout-material3/samples/build.gradle
@@ -28,13 +28,13 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
-    namespace "androidx.wear.protolayout.material3.samples"
+    namespace = "androidx.wear.protolayout.material3.samples"
 }
 
 androidx {
diff --git a/wear/protolayout/protolayout-renderer/build.gradle b/wear/protolayout/protolayout-renderer/build.gradle
index 4efa090..5ba8d45 100644
--- a/wear/protolayout/protolayout-renderer/build.gradle
+++ b/wear/protolayout/protolayout-renderer/build.gradle
@@ -54,10 +54,10 @@
 }
 
 android {
-    namespace "androidx.wear.protolayout.renderer"
+    namespace = "androidx.wear.protolayout.renderer"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 }
 
diff --git a/wear/protolayout/protolayout-testing/build.gradle b/wear/protolayout/protolayout-testing/build.gradle
index 443c60b..d584ccd 100644
--- a/wear/protolayout/protolayout-testing/build.gradle
+++ b/wear/protolayout/protolayout-testing/build.gradle
@@ -45,9 +45,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.protolayout.testing"
+    namespace = "androidx.wear.protolayout.testing"
 
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/wear/protolayout/protolayout/build.gradle b/wear/protolayout/protolayout/build.gradle
index 77b4b24..40a165c 100644
--- a/wear/protolayout/protolayout/build.gradle
+++ b/wear/protolayout/protolayout/build.gradle
@@ -48,10 +48,10 @@
 }
 
 android {
-    namespace "androidx.wear.protolayout"
+    namespace = "androidx.wear.protolayout"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle
index f1afc74..022a0fe 100644
--- a/wear/tiles/tiles-material/build.gradle
+++ b/wear/tiles/tiles-material/build.gradle
@@ -61,7 +61,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     sourceSets {
@@ -72,7 +72,7 @@
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    namespace "androidx.wear.tiles.material"
+    namespace = "androidx.wear.tiles.material"
 }
 
 androidx {
diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
index 8c21683..d50ba1d 100644
--- a/wear/tiles/tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -71,7 +71,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     buildTypes.configureEach {
@@ -84,7 +84,7 @@
     sourceSets {
         androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear-tiles-renderer"
     }
-    namespace "androidx.wear.tiles.renderer"
+    namespace = "androidx.wear.tiles.renderer"
 }
 
 protobuf {
diff --git a/wear/tiles/tiles-samples/build.gradle b/wear/tiles/tiles-samples/build.gradle
index dea63a7..738fabd 100644
--- a/wear/tiles/tiles-samples/build.gradle
+++ b/wear/tiles/tiles-samples/build.gradle
@@ -24,26 +24,24 @@
 }
 
 android {
-    namespace 'androidx.wear.tiles.samples'
-    compileSdk 35
+    namespace = "androidx.wear.tiles.samples"
+    compileSdk = 35
 
     defaultConfig {
-        applicationId "androidx.wear.tiles.samples"
-        minSdk 30
-        targetSdk 35
-        versionCode 1
-        versionName "1.0"
+        applicationId = "androidx.wear.tiles.samples"
+        minSdk = 30
+        targetSdk = 35
     }
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
 }
 
diff --git a/wear/tiles/tiles-testing/build.gradle b/wear/tiles/tiles-testing/build.gradle
index dd6fb76..b7c9811 100644
--- a/wear/tiles/tiles-testing/build.gradle
+++ b/wear/tiles/tiles-testing/build.gradle
@@ -58,12 +58,12 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.tiles.testing"
+    namespace = "androidx.wear.tiles.testing"
 }
 
 androidx {
diff --git a/wear/tiles/tiles-tooling-preview/build.gradle b/wear/tiles/tiles-tooling-preview/build.gradle
index c77141c..dc02618 100644
--- a/wear/tiles/tiles-tooling-preview/build.gradle
+++ b/wear/tiles/tiles-tooling-preview/build.gradle
@@ -41,9 +41,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.tiles.tooling.preview"
+    namespace = "androidx.wear.tiles.tooling.preview"
 }
 
 androidx {
diff --git a/wear/tiles/tiles-tooling/build.gradle b/wear/tiles/tiles-tooling/build.gradle
index d7541b8..ca1ceec 100644
--- a/wear/tiles/tiles-tooling/build.gradle
+++ b/wear/tiles/tiles-tooling/build.gradle
@@ -38,10 +38,10 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
-    namespace "androidx.wear.tiles.tooling"
+    namespace = "androidx.wear.tiles.tooling"
 }
 
 androidx {
diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle
index a69618c..97583f3 100644
--- a/wear/tiles/tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -52,7 +52,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildFeatures {
         aidl = true
@@ -63,7 +63,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.tiles"
+    namespace = "androidx.wear.tiles"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-client-guava/build.gradle b/wear/watchface/watchface-client-guava/build.gradle
index 310b255..fecf04a 100644
--- a/wear/watchface/watchface-client-guava/build.gradle
+++ b/wear/watchface/watchface-client-guava/build.gradle
@@ -56,7 +56,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.watchface.client.guava"
+    namespace = "androidx.wear.watchface.client.guava"
 }
diff --git a/wear/watchface/watchface-client/build.gradle b/wear/watchface/watchface-client/build.gradle
index f43e366..bfb0889 100644
--- a/wear/watchface/watchface-client/build.gradle
+++ b/wear/watchface/watchface-client/build.gradle
@@ -61,14 +61,14 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     sourceSets.androidTest.assets.srcDirs +=
             project.rootDir.absolutePath + "/../../golden/wear/wear-watchface-client"
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.client"
+    namespace = "androidx.wear.watchface.client"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-complications-data-source-ktx/build.gradle b/wear/watchface/watchface-complications-data-source-ktx/build.gradle
index 716ec1a..62bbfe2 100644
--- a/wear/watchface/watchface-complications-data-source-ktx/build.gradle
+++ b/wear/watchface/watchface-complications-data-source-ktx/build.gradle
@@ -35,12 +35,12 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.complications.datasource.ktx"
+    namespace = "androidx.wear.watchface.complications.datasource.ktx"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-complications-data-source-samples/build.gradle b/wear/watchface/watchface-complications-data-source-samples/build.gradle
index bccb6ae..7b1223f 100644
--- a/wear/watchface/watchface-complications-data-source-samples/build.gradle
+++ b/wear/watchface/watchface-complications-data-source-samples/build.gradle
@@ -29,13 +29,13 @@
 
 android {
     defaultConfig {
-        minSdkVersion 29
+        minSdk = 29
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
 
@@ -52,5 +52,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.watchface.complications.datasource.samples"
+    namespace = "androidx.wear.watchface.complications.datasource.samples"
 }
diff --git a/wear/watchface/watchface-complications-data-source/build.gradle b/wear/watchface/watchface-complications-data-source/build.gradle
index 1ffd85c..bd10133 100644
--- a/wear/watchface/watchface-complications-data-source/build.gradle
+++ b/wear/watchface/watchface-complications-data-source/build.gradle
@@ -53,12 +53,12 @@
         aidl = true
     }
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.complications.datasource"
+    namespace = "androidx.wear.watchface.complications.datasource"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-complications-data/build.gradle b/wear/watchface/watchface-complications-data/build.gradle
index a9a309b..579d3a7 100644
--- a/wear/watchface/watchface-complications-data/build.gradle
+++ b/wear/watchface/watchface-complications-data/build.gradle
@@ -64,7 +64,7 @@
         aidl = true
     }
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
@@ -72,7 +72,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.complications.data"
+    namespace = "androidx.wear.watchface.complications.data"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
index 1ef5703..4254a8e 100644
--- a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
+++ b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
@@ -36,9 +36,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.watchface.complications.permission.dialogs.sample"
+    namespace = "androidx.wear.watchface.complications.permission.dialogs.sample"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-complications-rendering/build.gradle b/wear/watchface/watchface-complications-rendering/build.gradle
index 25388ff..995d4ad 100644
--- a/wear/watchface/watchface-complications-rendering/build.gradle
+++ b/wear/watchface/watchface-complications-rendering/build.gradle
@@ -57,7 +57,7 @@
         aidl = true
     }
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     lintOptions {
         disable 'NullabilityAnnotationsDetector' // False alarm on transformed files.
@@ -65,7 +65,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.complications.rendering"
+    namespace = "androidx.wear.watchface.complications.rendering"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-complications/build.gradle b/wear/watchface/watchface-complications/build.gradle
index f238bd8..0ce442d 100644
--- a/wear/watchface/watchface-complications/build.gradle
+++ b/wear/watchface/watchface-complications/build.gradle
@@ -57,11 +57,11 @@
         aidl = true
     }
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.complications"
+    namespace = "androidx.wear.watchface.complications"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-data/build.gradle b/wear/watchface/watchface-data/build.gradle
index 3ba380a..7eae58b 100644
--- a/wear/watchface/watchface-data/build.gradle
+++ b/wear/watchface/watchface-data/build.gradle
@@ -42,7 +42,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     buildFeatures {
@@ -52,7 +52,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.wear.watchface.data"
+    namespace = "androidx.wear.watchface.data"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-editor-guava/build.gradle b/wear/watchface/watchface-editor-guava/build.gradle
index 15c9ff976..be06686 100644
--- a/wear/watchface/watchface-editor-guava/build.gradle
+++ b/wear/watchface/watchface-editor-guava/build.gradle
@@ -54,7 +54,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.watchface.editor.guava"
+    namespace = "androidx.wear.watchface.editor.guava"
 }
diff --git a/wear/watchface/watchface-editor/build.gradle b/wear/watchface/watchface-editor/build.gradle
index b3747af..598b989 100644
--- a/wear/watchface/watchface-editor/build.gradle
+++ b/wear/watchface/watchface-editor/build.gradle
@@ -58,9 +58,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.watchface.editor"
+    namespace = "androidx.wear.watchface.editor"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-editor/samples/build.gradle b/wear/watchface/watchface-editor/samples/build.gradle
index 9cd724a..834dc14 100644
--- a/wear/watchface/watchface-editor/samples/build.gradle
+++ b/wear/watchface/watchface-editor/samples/build.gradle
@@ -39,9 +39,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.watchface.editor.samples"
+    namespace = "androidx.wear.watchface.editor.samples"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-guava/build.gradle b/wear/watchface/watchface-guava/build.gradle
index 4328bbb..d975a8c 100644
--- a/wear/watchface/watchface-guava/build.gradle
+++ b/wear/watchface/watchface-guava/build.gradle
@@ -62,10 +62,10 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface.guava"
+    namespace = "androidx.wear.watchface.guava"
 }
diff --git a/wear/watchface/watchface-samples-minimal-complications/build.gradle b/wear/watchface/watchface-samples-minimal-complications/build.gradle
index 1ea310b..9a75607 100644
--- a/wear/watchface/watchface-samples-minimal-complications/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-complications/build.gradle
@@ -35,14 +35,14 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.wear.watchface.samples.minimal.complications"
-        minSdkVersion 26
+        applicationId = "androidx.wear.watchface.samples.minimal.complications"
+        minSdk = 26
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
@@ -51,5 +51,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.watchface.samples.minimal.complications"
+    namespace = "androidx.wear.watchface.samples.minimal.complications"
 }
diff --git a/wear/watchface/watchface-samples-minimal-instances/build.gradle b/wear/watchface/watchface-samples-minimal-instances/build.gradle
index ccbc592..4880407 100644
--- a/wear/watchface/watchface-samples-minimal-instances/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-instances/build.gradle
@@ -34,14 +34,14 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.wear.watchface.samples.minimal.instances"
-        minSdkVersion 30
+        applicationId = "androidx.wear.watchface.samples.minimal.instances"
+        minSdk = 30
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
@@ -50,5 +50,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.watchface.samples.minimal.instances"
+    namespace = "androidx.wear.watchface.samples.minimal.instances"
 }
diff --git a/wear/watchface/watchface-samples-minimal-style/build.gradle b/wear/watchface/watchface-samples-minimal-style/build.gradle
index 1bce071..67020f8 100644
--- a/wear/watchface/watchface-samples-minimal-style/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-style/build.gradle
@@ -32,14 +32,14 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.wear.watchface.samples.minimal.style"
-        minSdkVersion 26
+        applicationId = "androidx.wear.watchface.samples.minimal.style"
+        minSdk = 26
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
@@ -48,5 +48,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.watchface.samples.minimal.style"
+    namespace = "androidx.wear.watchface.samples.minimal.style"
 }
diff --git a/wear/watchface/watchface-style/build.gradle b/wear/watchface/watchface-style/build.gradle
index 333ba3b7..9f9bc53 100644
--- a/wear/watchface/watchface-style/build.gradle
+++ b/wear/watchface/watchface-style/build.gradle
@@ -40,7 +40,7 @@
 
     // Note that the artifact directory included contain multiple output-metadata.json files built
     // with the apks. Since we're not interested in those we can simply exclude duplicates.
-    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 // Define a configuration that can be resolved. This project is the consumer of test apks, i.e. it
@@ -92,13 +92,13 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
     sourceSets.androidTest.assets.srcDir(copyApkTaskProvider)
-    namespace "androidx.wear.watchface.style"
+    namespace = "androidx.wear.watchface.style"
 }
 
 androidx {
diff --git a/wear/watchface/watchface-style/old-api-test-service/build.gradle b/wear/watchface/watchface-style/old-api-test-service/build.gradle
index 441f679..4c07250 100644
--- a/wear/watchface/watchface-style/old-api-test-service/build.gradle
+++ b/wear/watchface/watchface-style/old-api-test-service/build.gradle
@@ -50,19 +50,19 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
     buildFeatures {
         aidl = true
     }
-    namespace "androidx.wear.watchface.style.test.oldApiTestService"
+    namespace = "androidx.wear.watchface.style.test.oldApiTestService"
 }
 
 /*
diff --git a/wear/watchface/watchface-style/old-api-test-stub/build.gradle b/wear/watchface/watchface-style/old-api-test-stub/build.gradle
index 0d17e5a..0c523b5 100644
--- a/wear/watchface/watchface-style/old-api-test-stub/build.gradle
+++ b/wear/watchface/watchface-style/old-api-test-stub/build.gradle
@@ -47,10 +47,10 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
     buildFeatures {
         aidl = true
     }
-    namespace "androidx.wear.watchface.style.test.oldApiTestStub"
+    namespace = "androidx.wear.watchface.style.test.oldApiTestStub"
 }
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle
index 2a4b5ee..fdb7d3e 100644
--- a/wear/watchface/watchface/build.gradle
+++ b/wear/watchface/watchface/build.gradle
@@ -67,7 +67,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     sourceSets.androidTest.assets.srcDirs +=
@@ -75,7 +75,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.watchface"
+    namespace = "androidx.wear.watchface"
 }
 
 androidx {
diff --git a/wear/watchface/watchface/samples/app/build.gradle b/wear/watchface/watchface/samples/app/build.gradle
index 227a7ae..69fc4f8 100644
--- a/wear/watchface/watchface/samples/app/build.gradle
+++ b/wear/watchface/watchface/samples/app/build.gradle
@@ -25,13 +25,13 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
 
@@ -48,5 +48,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.watchface.samples.app"
+    namespace = "androidx.wear.watchface.samples.app"
 }
diff --git a/wear/watchface/watchface/samples/build.gradle b/wear/watchface/watchface/samples/build.gradle
index ee1d2ce..2edc714 100644
--- a/wear/watchface/watchface/samples/build.gradle
+++ b/wear/watchface/watchface/samples/build.gradle
@@ -48,7 +48,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 26
+        minSdk = 26
     }
-    namespace "androidx.wear.watchface.samples"
+    namespace = "androidx.wear.watchface.samples"
 }
diff --git a/wear/watchface/watchface/samples/minimal/build.gradle b/wear/watchface/watchface/samples/minimal/build.gradle
index 1c78a40..e8f6581 100644
--- a/wear/watchface/watchface/samples/minimal/build.gradle
+++ b/wear/watchface/watchface/samples/minimal/build.gradle
@@ -43,14 +43,14 @@
 
 android {
     defaultConfig {
-        applicationId "androidx.wear.watchface.samples.minimal"
-        minSdkVersion 26
+        applicationId = "androidx.wear.watchface.samples.minimal"
+        minSdk = 26
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
@@ -59,5 +59,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.watchface.samples.minimal"
+    namespace = "androidx.wear.watchface.samples.minimal"
 }
diff --git a/wear/wear-core/build.gradle b/wear/wear-core/build.gradle
index 779ef2c..d2da2b6 100644
--- a/wear/wear-core/build.gradle
+++ b/wear/wear-core/build.gradle
@@ -42,7 +42,7 @@
 }
 
 android {
-    namespace "androidx.wear.core"
+    namespace = "androidx.wear.core"
 }
 
 androidx {
diff --git a/wear/wear-input-testing/build.gradle b/wear/wear-input-testing/build.gradle
index ead0e47..eec6707 100644
--- a/wear/wear-input-testing/build.gradle
+++ b/wear/wear-input-testing/build.gradle
@@ -35,9 +35,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.input.testing"
+    namespace = "androidx.wear.input.testing"
 }
 
 androidx {
diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle
index 6c12779..3024fcb 100644
--- a/wear/wear-input/build.gradle
+++ b/wear/wear-input/build.gradle
@@ -47,12 +47,12 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.input"
+    namespace = "androidx.wear.input"
 }
 
 androidx {
diff --git a/wear/wear-input/samples/build.gradle b/wear/wear-input/samples/build.gradle
index f145716..682525e 100644
--- a/wear/wear-input/samples/build.gradle
+++ b/wear/wear-input/samples/build.gradle
@@ -39,9 +39,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.input.samples"
+    namespace = "androidx.wear.input.samples"
 }
 
 androidx {
diff --git a/wear/wear-ongoing/build.gradle b/wear/wear-ongoing/build.gradle
index 53aed7d..65718d9 100644
--- a/wear/wear-ongoing/build.gradle
+++ b/wear/wear-ongoing/build.gradle
@@ -30,12 +30,12 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.ongoing"
+    namespace = "androidx.wear.ongoing"
 }
 
 androidx {
diff --git a/wear/wear-phone-interactions/build.gradle b/wear/wear-phone-interactions/build.gradle
index 0e3a7e9..0549f6b 100644
--- a/wear/wear-phone-interactions/build.gradle
+++ b/wear/wear-phone-interactions/build.gradle
@@ -54,7 +54,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
 
     // Use Robolectric 4.+
@@ -65,10 +65,10 @@
     }
     buildTypes.configureEach {
         stableAidl {
-            version 1
+            version = 1
         }
     }
-    namespace "androidx.wear.phone.interactions"
+    namespace = "androidx.wear.phone.interactions"
 }
 
 androidx {
diff --git a/wear/wear-phone-interactions/samples/build.gradle b/wear/wear-phone-interactions/samples/build.gradle
index 0bc144d..6dbaba5 100644
--- a/wear/wear-phone-interactions/samples/build.gradle
+++ b/wear/wear-phone-interactions/samples/build.gradle
@@ -38,9 +38,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
-    namespace "androidx.wear.phone.interactions.samples"
+    namespace = "androidx.wear.phone.interactions.samples"
 }
 
 androidx {
diff --git a/wear/wear-remote-interactions/build.gradle b/wear/wear-remote-interactions/build.gradle
index a0572fc..9c302d2 100644
--- a/wear/wear-remote-interactions/build.gradle
+++ b/wear/wear-remote-interactions/build.gradle
@@ -61,12 +61,12 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear.remote.interactions"
+    namespace = "androidx.wear.remote.interactions"
 }
 
 androidx {
diff --git a/wear/wear-remote-interactions/samples/build.gradle b/wear/wear-remote-interactions/samples/build.gradle
index 0baf948..aabf0e0 100644
--- a/wear/wear-remote-interactions/samples/build.gradle
+++ b/wear/wear-remote-interactions/samples/build.gradle
@@ -38,9 +38,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.wear.remote.interactions.samples"
+    namespace = "androidx.wear.remote.interactions.samples"
 }
 
 androidx {
diff --git a/wear/wear-samples-ambient/build.gradle b/wear/wear-samples-ambient/build.gradle
index f731c07..2d6afd4 100644
--- a/wear/wear-samples-ambient/build.gradle
+++ b/wear/wear-samples-ambient/build.gradle
@@ -45,13 +45,13 @@
 
 android {
     defaultConfig {
-        minSdkVersion 25
+        minSdk = 25
     }
 
     buildTypes {
 	release {
-	    minifyEnabled true
-	    shrinkResources true
+	    minifyEnabled = true
+	    shrinkResources = true
 	    proguardFiles getDefaultProguardFile('proguard-android.txt')
 	}
     }
@@ -60,5 +60,5 @@
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-    namespace "androidx.wear.samples.ambient"
+    namespace = "androidx.wear.samples.ambient"
 }
diff --git a/wear/wear-tooling-preview/build.gradle b/wear/wear-tooling-preview/build.gradle
index 078f3f2..af60960 100644
--- a/wear/wear-tooling-preview/build.gradle
+++ b/wear/wear-tooling-preview/build.gradle
@@ -35,7 +35,7 @@
 }
 
 android {
-    namespace "androidx.wear.tooling.preview"
+    namespace = "androidx.wear.tooling.preview"
 }
 
 androidx {
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle
index f9115d1..ce07763 100644
--- a/wear/wear/build.gradle
+++ b/wear/wear/build.gradle
@@ -54,7 +54,7 @@
 
 android {
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
 
     sourceSets {
@@ -68,7 +68,7 @@
 
     // Use Robolectric 4.+
     testOptions.unitTests.includeAndroidResources = true
-    namespace "androidx.wear"
+    namespace = "androidx.wear"
 }
 
 androidx {
diff --git a/webkit/integration-tests/instrumentation/build.gradle b/webkit/integration-tests/instrumentation/build.gradle
index 3ced188..9a60b4a 100644
--- a/webkit/integration-tests/instrumentation/build.gradle
+++ b/webkit/integration-tests/instrumentation/build.gradle
@@ -5,25 +5,26 @@
  * Please use that script when creating a new project, rather than copying an existing project and
  * modifying its settings.
  */
-import androidx.build.Publish
+
 import androidx.build.LibraryType
 
 plugins {
     id("AndroidXPlugin")
-    id('com.android.library')
+    id("com.android.library")
 }
+
 android {
-    namespace 'androidx.webkit.instrumentation'
+    namespace = "androidx.webkit.instrumentation"
 
     flavorDimensions = ["targetSdk"]
 
     productFlavors {
         targetSdk32 {
-            dimension "targetSdk"
+            dimension = "targetSdk"
 
         }
         targetSdkLatest {
-            dimension "targetSdk"
+            dimension = "targetSdk"
             // uses default config
         }
     }
diff --git a/webkit/integration-tests/testapp/build.gradle b/webkit/integration-tests/testapp/build.gradle
index 5071e58..91ab43a 100644
--- a/webkit/integration-tests/testapp/build.gradle
+++ b/webkit/integration-tests/testapp/build.gradle
@@ -62,10 +62,10 @@
     }
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled = true
         }
     }
-    namespace "com.example.androidx.webkit"
+    namespace = "com.example.androidx.webkit"
 }
 
 androidx {
diff --git a/webkit/webkit/build.gradle b/webkit/webkit/build.gradle
index 79a0387..d3c3d4f 100644
--- a/webkit/webkit/build.gradle
+++ b/webkit/webkit/build.gradle
@@ -65,7 +65,7 @@
                 "proguard-rules.pro"
         )
     }
-    namespace "androidx.webkit"
+    namespace = "androidx.webkit"
 }
 
 androidx {
diff --git a/window/extensions/core/core/build.gradle b/window/extensions/core/core/build.gradle
index fbda3e0..8536ef4 100644
--- a/window/extensions/core/core/build.gradle
+++ b/window/extensions/core/core/build.gradle
@@ -42,7 +42,7 @@
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.window.extensions.core"
+    namespace = "androidx.window.extensions.core"
 }
 
 tasks.withType(KotlinCompile).configureEach {
diff --git a/window/extensions/extensions/build.gradle b/window/extensions/extensions/build.gradle
index 69ed9c7..7781812 100644
--- a/window/extensions/extensions/build.gradle
+++ b/window/extensions/extensions/build.gradle
@@ -61,5 +61,5 @@
 }
 
 android {
-    namespace "androidx.window.extensions"
+    namespace = "androidx.window.extensions"
 }
diff --git a/window/integration-tests/configuration-change-tests/build.gradle b/window/integration-tests/configuration-change-tests/build.gradle
index d376316..0e25b1b 100644
--- a/window/integration-tests/configuration-change-tests/build.gradle
+++ b/window/integration-tests/configuration-change-tests/build.gradle
@@ -30,7 +30,7 @@
 }
 
 android {
-    namespace "androidx.window.integration"
+    namespace = "androidx.window.integration"
 }
 
 dependencies {
diff --git a/window/integration-tests/macrobenchmark-target/build.gradle b/window/integration-tests/macrobenchmark-target/build.gradle
index 1631c90..71c5952 100644
--- a/window/integration-tests/macrobenchmark-target/build.gradle
+++ b/window/integration-tests/macrobenchmark-target/build.gradle
@@ -21,19 +21,19 @@
 }
 
 android {
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
-        minSdk 28
+        minSdk = 28
     }
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
         }
     }
-    namespace "androidx.window.integration.macrobenchmark.target"
+    namespace = "androidx.window.integration.macrobenchmark.target"
 }
 
 dependencies {
diff --git a/window/integration-tests/macrobenchmark/build.gradle b/window/integration-tests/macrobenchmark/build.gradle
index 508f1b6..8214f6f 100644
--- a/window/integration-tests/macrobenchmark/build.gradle
+++ b/window/integration-tests/macrobenchmark/build.gradle
@@ -22,9 +22,9 @@
 
 android {
     defaultConfig {
-        minSdkVersion 29
+        minSdk = 29
     }
-    namespace "androidx.window.integration.macrobenchmark"
+    namespace = "androidx.window.integration.macrobenchmark"
     targetProjectPath = ":window:integration-tests:macrobenchmark-target"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/window/sidecar/sidecar/build.gradle b/window/sidecar/sidecar/build.gradle
index 1bc1ce1..e902d344 100644
--- a/window/sidecar/sidecar/build.gradle
+++ b/window/sidecar/sidecar/build.gradle
@@ -45,5 +45,5 @@
 }
 
 android {
-    namespace "androidx.window.sidecar"
+    namespace = "androidx.window.sidecar"
 }
diff --git a/window/window-demos/demo-common/build.gradle b/window/window-demos/demo-common/build.gradle
index 27c4c9c..354f7b7 100644
--- a/window/window-demos/demo-common/build.gradle
+++ b/window/window-demos/demo-common/build.gradle
@@ -22,15 +22,15 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
         targetSdkVersion 35
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.window.demo.common"
+    namespace = "androidx.window.demo.common"
 }
 
 dependencies {
diff --git a/window/window-demos/demo-second-app/build.gradle b/window/window-demos/demo-second-app/build.gradle
index c39a226..8a2298c 100644
--- a/window/window-demos/demo-second-app/build.gradle
+++ b/window/window-demos/demo-second-app/build.gradle
@@ -21,16 +21,16 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.window.demo2"
-        minSdkVersion 23
+        applicationId = "androidx.window.demo2"
+        minSdk = 23
         targetSdkVersion 35
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.window.demo2"
+    namespace = "androidx.window.demo2"
 }
 
 dependencies {
diff --git a/window/window-demos/demo/build.gradle b/window/window-demos/demo/build.gradle
index eff3b6e..d6ba898 100644
--- a/window/window-demos/demo/build.gradle
+++ b/window/window-demos/demo/build.gradle
@@ -32,16 +32,16 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        applicationId "androidx.window.demo"
-        minSdkVersion 23
-        targetSdkVersion 35
+        applicationId = "androidx.window.demo"
+        minSdk = 23
+        targetSdk = 35
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
-    namespace "androidx.window.demo"
+    namespace = "androidx.window.demo"
     signingConfigs {
         config {
             keyAlias 'key'
@@ -52,10 +52,10 @@
     }
     buildTypes {
         configureEach {
-            signingConfig signingConfigs.config
+            signingConfig = signingConfigs.config
         }
         release {
-            minifyEnabled true
+            minifyEnabled = true
             applicationIdSuffix ".release"
         }
         debug {
diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle
index bd85a6a..ba672d7 100644
--- a/window/window-java/build.gradle
+++ b/window/window-java/build.gradle
@@ -63,5 +63,5 @@
 }
 
 android {
-    namespace "androidx.window.java"
+    namespace = "androidx.window.java"
 }
diff --git a/window/window-rxjava2/build.gradle b/window/window-rxjava2/build.gradle
index 6477bf6..f8ccb33 100644
--- a/window/window-rxjava2/build.gradle
+++ b/window/window-rxjava2/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.window.rxjava2"
+    namespace = "androidx.window.rxjava2"
 }
 
 dependencies {
diff --git a/window/window-rxjava3/build.gradle b/window/window-rxjava3/build.gradle
index edba0d0..44e6ca8 100644
--- a/window/window-rxjava3/build.gradle
+++ b/window/window-rxjava3/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.window.rxjava3"
+    namespace = "androidx.window.rxjava3"
 }
 
 dependencies {
diff --git a/window/window-testing/build.gradle b/window/window-testing/build.gradle
index bac884b..e7f5051 100644
--- a/window/window-testing/build.gradle
+++ b/window/window-testing/build.gradle
@@ -32,7 +32,7 @@
 }
 
 android {
-    namespace "androidx.window.testing"
+    namespace = "androidx.window.testing"
 }
 
 dependencies {
diff --git a/window/window/build.gradle b/window/window/build.gradle
index 74c0c16..2186be7 100644
--- a/window/window/build.gradle
+++ b/window/window/build.gradle
@@ -45,7 +45,7 @@
             java.srcDir testUtilDir
         }
     }
-    namespace "androidx.window"
+    namespace = "androidx.window"
 }
 
 dependencies {
diff --git a/window/window/samples/build.gradle b/window/window/samples/build.gradle
index e1062a5..f2526b0 100644
--- a/window/window/samples/build.gradle
+++ b/window/window/samples/build.gradle
@@ -40,7 +40,7 @@
 }
 
 android {
-    namespace "androidx.window.samples"
+    namespace = "androidx.window.samples"
 }
 
 androidx {
diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle
index 65f9532..ddb8eb1 100644
--- a/work/integration-tests/testapp/build.gradle
+++ b/work/integration-tests/testapp/build.gradle
@@ -26,7 +26,7 @@
             minifyEnabled = true
         }
     }
-    compileSdkVersion 35
+    compileSdk = 35
     defaultConfig {
         javaCompileOptions {
             annotationProcessorOptions {
@@ -40,7 +40,7 @@
             useSupportLibrary = true
         }
     }
-    namespace "androidx.work.integration.testapp"
+    namespace = "androidx.work.integration.testapp"
 }
 
 dependencies {
diff --git a/work/work-benchmark/build.gradle b/work/work-benchmark/build.gradle
index c5e9353..695cac9 100644
--- a/work/work-benchmark/build.gradle
+++ b/work/work-benchmark/build.gradle
@@ -53,6 +53,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.work.benchmark"
+    compileSdk = 35
+    namespace = "androidx.work.benchmark"
 }
diff --git a/work/work-datatransfer/build.gradle b/work/work-datatransfer/build.gradle
index 21e3a10..3d6d0a6 100644
--- a/work/work-datatransfer/build.gradle
+++ b/work/work-datatransfer/build.gradle
@@ -30,11 +30,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
     }
-    namespace "androidx.work.datatransfer"
+    namespace = "androidx.work.datatransfer"
 }
 
 dependencies {
diff --git a/work/work-gcm/build.gradle b/work/work-gcm/build.gradle
index e06ae25..4c1fcdc 100644
--- a/work/work-gcm/build.gradle
+++ b/work/work-gcm/build.gradle
@@ -30,11 +30,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.work.impl.background.gcm"
+    namespace = "androidx.work.impl.background.gcm"
 }
 
 dependencies {
diff --git a/work/work-inspection/build.gradle b/work/work-inspection/build.gradle
index c86171b..5b6c43f 100644
--- a/work/work-inspection/build.gradle
+++ b/work/work-inspection/build.gradle
@@ -57,13 +57,13 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     defaultConfig {
         // studio pipeline works only starting with Android O
-        minSdkVersion 26
+        minSdk = 26
     }
     sourceSets {
         main.resources.srcDirs += "src/main/proto"
     }
-    namespace "androidx.work.inspection"
+    namespace = "androidx.work.inspection"
 }
diff --git a/work/work-multiprocess/build.gradle b/work/work-multiprocess/build.gradle
index 1529bb7..21784c1c 100644
--- a/work/work-multiprocess/build.gradle
+++ b/work/work-multiprocess/build.gradle
@@ -30,11 +30,11 @@
 }
 
 android {
-    compileSdk 35
+    compileSdk = 35
     buildTypes.configureEach {
         consumerProguardFiles "proguard-rules.pro"
     }
-    namespace "androidx.work.multiprocess"
+    namespace = "androidx.work.multiprocess"
 }
 
 dependencies {
diff --git a/work/work-runtime-ktx/build.gradle b/work/work-runtime-ktx/build.gradle
index 98868c5..29a313f 100644
--- a/work/work-runtime-ktx/build.gradle
+++ b/work/work-runtime-ktx/build.gradle
@@ -42,6 +42,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.work.ktx"
+    compileSdk = 35
+    namespace = "androidx.work.ktx"
 }
diff --git a/work/work-runtime/build.gradle b/work/work-runtime/build.gradle
index 94aa053..9df5509 100644
--- a/work/work-runtime/build.gradle
+++ b/work/work-runtime/build.gradle
@@ -38,10 +38,10 @@
         aidl = true
     }
     buildTypes.configureEach {
-        consumerProguardFiles "proguard-rules.pro"
+        consumerProguardFiles("proguard-rules.pro")
 
         stableAidl {
-            version 1
+            version = 1
         }
     }
     defaultConfig {
@@ -59,7 +59,7 @@
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/src/schemas".toString())
     }
-    namespace "androidx.work"
+    namespace = "androidx.work"
 }
 
 dependencies {
diff --git a/work/work-rxjava2/build.gradle b/work/work-rxjava2/build.gradle
index 08025cc..60b2b4f 100644
--- a/work/work-rxjava2/build.gradle
+++ b/work/work-rxjava2/build.gradle
@@ -49,6 +49,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.work.rxjava2"
+    compileSdk = 35
+    namespace = "androidx.work.rxjava2"
 }
diff --git a/work/work-rxjava3/build.gradle b/work/work-rxjava3/build.gradle
index 122af65..86064ed 100644
--- a/work/work-rxjava3/build.gradle
+++ b/work/work-rxjava3/build.gradle
@@ -48,6 +48,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.work.rxjava3"
+    compileSdk = 35
+    namespace = "androidx.work.rxjava3"
 }
diff --git a/work/work-testing/build.gradle b/work/work-testing/build.gradle
index a972b75..e5e98f6 100644
--- a/work/work-testing/build.gradle
+++ b/work/work-testing/build.gradle
@@ -62,6 +62,6 @@
 }
 
 android {
-    compileSdk 35
-    namespace "androidx.work.testing"
+    compileSdk = 35
+    namespace = "androidx.work.testing"
 }