diff --git a/.github/workflows/composescreenshot.yml b/.github/workflows/composescreenshot.yml
index c717f8305..ea5e69967 100644
--- a/.github/workflows/composescreenshot.yml
+++ b/.github/workflows/composescreenshot.yml
@@ -10,10 +10,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         
       - name: Set Up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '17'
diff --git a/.github/workflows/copy-branch.yml b/.github/workflows/copy-branch.yml
index f8f8572d9..46a0f90d3 100644
--- a/.github/workflows/copy-branch.yml
+++ b/.github/workflows/copy-branch.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it,
     # but specifies master branch (old default).
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: master
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 41735cbf2..f421734e6 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -12,5 +12,5 @@ jobs:
     name: Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v3
diff --git a/WORKSPACE b/WORKSPACE
index 868cb6fde..de217de75 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -75,22 +75,22 @@ maven_install(
         maven.artifact(
             "com.google.inject",
             "guice",
-            "4.0",
+            "7.0.0",
             neverlink = True,
         ),
-        "junit:junit:4.12",
+        "junit:junit:4.13.2",
         "javax.inject:javax.inject:1",
         "org.hamcrest:java-hamcrest:2.0.0.0",
         maven.artifact(
             "org.robolectric",
             "robolectric",
-            "4.3-beta-1",
+            "4.14.1",
             neverlink = True,
             exclusions = ["com.google.guava:guava"],
         ),
-        "com.google.guava:guava:26.0-android",
-        "com.google.truth:truth:0.42",
-        "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0",
+        "com.google.guava:guava:33.3.1-jre",
+        "com.google.truth:truth:1.4.4",
+        "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1",
     ],
     jetify = True,
     repositories = [
@@ -102,11 +102,11 @@ maven_install(
 
 http_archive(
     name = "bazel_toolchains",
-    sha256 = "4d348abfaddbcee0c077fc51bb1177065c3663191588ab3d958f027cbfe1818b",
-    strip_prefix = "bazel-toolchains-2.1.0",
+    sha256 = "ef30f61a17ac7f11a121e90818f85faa7ad27a99b6665bd59201afe17eca5182",
+    strip_prefix = "bazel-toolchains-5124557",
     urls = [
-        "https://github.com/bazelbuild/bazel-toolchains/releases/download/2.1.0/bazel-toolchains-2.1.0.tar.gz",
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.1.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-toolchains/releases/download/5124557/bazel-toolchains-5124557.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/5124557.tar.gz",
     ],
 )
 
diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle
index 5d2f7c613..eff9e23ff 100644
--- a/integration/ServiceTestRuleSample/app/build.gradle
+++ b/integration/ServiceTestRuleSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
index 2b290b52a..98fc02afb 100644
--- a/integration/ServiceTestRuleSample/build.gradle
+++ b/integration/ServiceTestRuleSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -26,6 +26,6 @@ allprojects {
 ext {
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
 }
diff --git a/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties b/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties
+++ b/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/renovate.json b/renovate.json
index abf4b0566..2071e72c8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,11 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>android/.github:renovate-config"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": ["com.google.guava:guava"],
+      "versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-(?<compatibility>.*))?$"
+    }
   ]
 }
diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle
index 072763155..445c1e47e 100644
--- a/runner/AndroidJunitRunnerSample/app/build.gradle
+++ b/runner/AndroidJunitRunnerSample/app/build.gradle
@@ -2,11 +2,11 @@ apply plugin: "com.android.application"
 
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.androidjunitrunnersample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
index 2ae25590d..1b5ba8086 100644
--- a/runner/AndroidJunitRunnerSample/build.gradle
+++ b/runner/AndroidJunitRunnerSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -25,12 +25,12 @@ allprojects {
 
 ext {
     buildToolsVersion = "32.0.0"
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
-    truthVersion = "1.1.3"
+    truthVersion = "1.4.4"
 }
diff --git a/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties
+++ b/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle
index ddd122498..8b9ffcbff 100644
--- a/runner/AndroidTestOrchestratorSample/app/build.gradle
+++ b/runner/AndroidTestOrchestratorSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.androidtestorchestratorsample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
index 0d83b3c4b..5e3df2194 100644
--- a/runner/AndroidTestOrchestratorSample/build.gradle
+++ b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -24,14 +24,14 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
-    monitorVersion = "1.7.1"
+    runnerVersion = "1.6.2"
+    monitorVersion = "1.7.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
-    orchestratorVersion = "1.5.0"
-    truthVersion = "1.1.3"
+    orchestratorVersion = "1.5.1"
+    truthVersion = "1.4.4"
 }
diff --git a/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties
+++ b/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle
index ae0284998..75db58363 100644
--- a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle
+++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 33
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.androidtestorchestratorsample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle
index 9ddb36c16..799859f35 100644
--- a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle
+++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -24,14 +24,13 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.2.0"
-    guavaVersion = "30.1.1-android"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    rulesVersion = "1.6.0-alpha01"
-    testServicesVersion = "1.5.0-alpha01"
-    orchestratorVersion = "1.5.0-alpha01"
-    espressoVersion = "3.6.0-alpha01"
-    truthVersion = "1.1.3"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-android"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.2"
+    testServicesVersion = "1.5.0"
+    orchestratorVersion = "1.5.1"
+    espressoVersion = "3.6.1"
+    truthVersion = "1.4.4"
 }
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties
index 92b8c8efb..94a5a6e66 100644
--- a/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties
+++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 01 11:09:45 PDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/PreviewScreenshot/app/build.gradle.kts b/ui/PreviewScreenshot/app/build.gradle.kts
index 32497ca2b..ab74d1500 100644
--- a/ui/PreviewScreenshot/app/build.gradle.kts
+++ b/ui/PreviewScreenshot/app/build.gradle.kts
@@ -22,12 +22,12 @@ plugins {
 
 android {
     namespace = "com.example.compose.previewscreenshot"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.example.compose.previewscreenshot"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
diff --git a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_1300b7bc_da39a3ee_0.png b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_1300b7bc_da39a3ee_0.png
deleted file mode 100644
index 8f6d965c0..000000000
Binary files a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_1300b7bc_da39a3ee_0.png and /dev/null differ
diff --git a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_3d8b4969_da39a3ee_0.png b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_3d8b4969_da39a3ee_0.png
deleted file mode 100644
index edc97a23f..000000000
Binary files a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_3d8b4969_da39a3ee_0.png and /dev/null differ
diff --git a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_faf0477b_da39a3ee_0.png b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_faf0477b_da39a3ee_0.png
deleted file mode 100644
index 31a110493..000000000
Binary files a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com.example.compose.previewscreenshot.MainScreen.GreetingPreview_faf0477b_da39a3ee_0.png and /dev/null differ
diff --git a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_302f22d1_0.png b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_302f22d1_0.png
new file mode 100644
index 000000000..e4cae8045
Binary files /dev/null and b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_302f22d1_0.png differ
diff --git a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_4d30ee2f_0.png b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_4d30ee2f_0.png
new file mode 100644
index 000000000..7a030ec06
Binary files /dev/null and b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_4d30ee2f_0.png differ
diff --git a/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_748aa731_0.png b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_748aa731_0.png
new file mode 100644
index 000000000..949ad14ff
Binary files /dev/null and b/ui/PreviewScreenshot/app/src/debug/screenshotTest/reference/com/example/compose/previewscreenshot/MainScreen/GreetingPreview_748aa731_0.png differ
diff --git a/ui/PreviewScreenshot/gradle/libs.versions.toml b/ui/PreviewScreenshot/gradle/libs.versions.toml
index c6b55a64f..5874876b4 100644
--- a/ui/PreviewScreenshot/gradle/libs.versions.toml
+++ b/ui/PreviewScreenshot/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-agp = "8.5.0-beta01"
+agp = "8.7.3"
 kotlin = "1.9.23"
-coreKtx = "1.13.1"
+coreKtx = "1.15.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-lifecycleRuntimeKtx = "2.7.0"
-activityCompose = "1.9.0"
-composeBom = "2024.05.00"
-screenshot = "0.0.1-alpha01"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.7"
+activityCompose = "1.9.3"
+composeBom = "2024.11.00"
+screenshot = "0.0.1-alpha08"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
diff --git a/ui/PreviewScreenshot/gradle/wrapper/gradle-wrapper.properties b/ui/PreviewScreenshot/gradle/wrapper/gradle-wrapper.properties
index 00b418953..06bdb3244 100644
--- a/ui/PreviewScreenshot/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/PreviewScreenshot/gradle/wrapper/gradle-wrapper.properties
@@ -17,6 +17,6 @@
 #Tue May 14 09:02:08 UTC 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle
index 0511b3aa0..abf2b1a93 100644
--- a/ui/espresso/AccessibilitySample/app/build.gradle
+++ b/ui/espresso/AccessibilitySample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.AccessibilitySample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -66,5 +66,5 @@ dependencies {
         // workaround for https://github.com/android/android-test/issues/861
         exclude group: "org.checkerframework", module: "checker"
     }
-    androidTestImplementation "com.google.truth:truth:1.1.3"
+    androidTestImplementation "com.google.truth:truth:1.4.4"
 }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
index 7d67bb028..9fb6d9dc0 100644
--- a/ui/espresso/AccessibilitySample/build.gradle
+++ b/ui/espresso/AccessibilitySample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.9.22"
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -26,12 +26,12 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
+    androidxAnnotationVersion = "1.9.1"
     robolectricVersion = "4.13"
     extTruthVersion = "1.6.0"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     espressoVersion = "3.6.1"
-    guavaVersion = "31.1-android"
+    guavaVersion = "33.3.1-jre"
 }
diff --git a/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle
index 4e3d91221..044fefc91 100644
--- a/ui/espresso/BasicSample/app/build.gradle
+++ b/ui/espresso/BasicSample/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.BasicSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -62,7 +62,7 @@ dependencies {
 
     testImplementation "androidx.test:core:" + rootProject.coreVersion;
     testImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:" + rootProject.robolectricVersion
     testImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
     testImplementation "androidx.test.espresso:espresso-intents:" + rootProject.espressoVersion
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
index 817618f6f..d7da04d62 100644
--- a/ui/espresso/BasicSample/build.gradle
+++ b/ui/espresso/BasicSample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.9.22"
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -26,12 +26,12 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    robolectricVersion = "4.13"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    robolectricVersion = "4.14.1"
+    guavaVersion = "33.3.1-jre"
     extTruthVersion = "1.6.0"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle
index 0774be6bf..f3b3fcf80 100644
--- a/ui/espresso/CustomMatcherSample/app/build.gradle
+++ b/ui/espresso/CustomMatcherSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.CustomMatcherSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
index 33e0a5140..10849a9a5 100644
--- a/ui/espresso/CustomMatcherSample/build.gradle
+++ b/ui/espresso/CustomMatcherSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -24,12 +24,12 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
-    robolectricVersion = "4.13"
+    robolectricVersion = "4.14.1"
 }
diff --git a/ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle
index 35076625c..77e7b93b8 100644
--- a/ui/espresso/DataAdapterSample/app/build.gradle
+++ b/ui/espresso/DataAdapterSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.DataAdapterSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml b/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml
index bdceefb5b..e32c40d97 100644
--- a/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml
+++ b/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.testing.espresso.DataAdapterSample" >
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="28" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="35" />
 
 </manifest>
diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
index 86a5128e7..1ea225069 100644
--- a/ui/espresso/DataAdapterSample/build.gradle
+++ b/ui/espresso/DataAdapterSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -24,11 +24,11 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     espressoVersion = "3.6.1"
-    robolectricVersion = "4.13"
+    robolectricVersion = "4.14.1"
 }
diff --git a/ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/EspressoDeviceSample/app/build.gradle b/ui/espresso/EspressoDeviceSample/app/build.gradle
index a8a23dd64..52627ca1f 100644
--- a/ui/espresso/EspressoDeviceSample/app/build.gradle
+++ b/ui/espresso/EspressoDeviceSample/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.EspressoDeviceSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -58,6 +58,6 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-device:" + rootProject.espressoDeviceVersion
 
     testImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:" + rootProject.robolectricVersion
 }
diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle
index eb45cb2df..a4bf67f2b 100644
--- a/ui/espresso/EspressoDeviceSample/build.gradle
+++ b/ui/espresso/EspressoDeviceSample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.9.22"
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -26,8 +26,8 @@ allprojects {
 }
 
 ext {
-    robolectricVersion = "4.13"
+    robolectricVersion = "4.14.1"
     extTruthVersion = "1.6.0"
     extJUnitVersion = "1.2.1"
-    espressoDeviceVersion = "1.0.0-alpha09"
+    espressoDeviceVersion = "1.0.1"
 }
diff --git a/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/FragmentScenarioSample/app/build.gradle b/ui/espresso/FragmentScenarioSample/app/build.gradle
index eac4095e4..853a6629d 100644
--- a/ui/espresso/FragmentScenarioSample/app/build.gradle
+++ b/ui/espresso/FragmentScenarioSample/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.FragmentScenarioSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -65,13 +65,13 @@ dependencies {
     debugImplementation "androidx.fragment:fragment-testing:" + rootProject.androidxFragmentVersion
     debugImplementation "androidx.test:core:" + rootProject.coreVersion
 
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:" + rootProject.robolectricVersion
     testImplementation "androidx.test:core:" + rootProject.coreVersion
     testImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
     testImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
     testImplementation "com.google.truth:truth:" + rootProject.truthVersion
-    testAnnotationProcessor "com.google.auto.service:auto-service:1.0-rc4"
+    testAnnotationProcessor "com.google.auto.service:auto-service:1.1.1"
 
     androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
     androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
index c2a028acf..b1cd5886f 100644
--- a/ui/espresso/FragmentScenarioSample/build.gradle
+++ b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.9.22"
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         google()
         mavenCentral()
@@ -28,14 +28,14 @@ task clean(type: Delete) {
 
 ext {
     buildToolsVersion = "32.0.0"
-    androidxCoreVersion = "1.9.0"
-    androidxCompatVersion = "1.5.1"
-    androidxFragmentVersion = "1.5.3"
+    androidxCoreVersion = "1.15.0"
+    androidxCompatVersion = "1.7.0"
+    androidxFragmentVersion = "1.8.5"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
-    robolectricVersion = "4.13"
-    truthVersion = "1.1.3"
+    robolectricVersion = "4.14.1"
+    truthVersion = "1.4.4"
 }
diff --git a/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties
index c00c06d34..14ef8e458 100644
--- a/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle
index 4da492c38..12f786436 100644
--- a/ui/espresso/IdlingResourceSample/app/build.gradle
+++ b/ui/espresso/IdlingResourceSample/app/build.gradle
@@ -17,12 +17,12 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.android.testing.espresso.IdlingResourceSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
index c9f1833e2..40f93162d 100644
--- a/ui/espresso/IdlingResourceSample/build.gradle
+++ b/ui/espresso/IdlingResourceSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -40,10 +40,10 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle
index 24df560a1..9a6a7d9a8 100644
--- a/ui/espresso/IntentsAdvancedSample/app/build.gradle
+++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 35
     buildToolsVersion = rootProject.buildToolsVersion
     defaultConfig {
         applicationId "com.example.android.testing.espresso.intents.AdvancedSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle
index f89d8d2d7..a250422ef 100644
--- a/ui/espresso/IntentsAdvancedSample/build.gradle
+++ b/ui/espresso/IntentsAdvancedSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -25,10 +25,10 @@ allprojects {
 
 ext {
     buildToolsVersion = "32.0.0"
-    androidxAnnotationVersion = "1.5.0"
+    androidxAnnotationVersion = "1.9.1"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle
index 08cca1c84..cb6f9e93c 100644
--- a/ui/espresso/IntentsBasicSample/app/build.gradle
+++ b/ui/espresso/IntentsBasicSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.IntentsBasicSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle
index e9666e2a7..04d5c962f 100644
--- a/ui/espresso/IntentsBasicSample/build.gradle
+++ b/ui/espresso/IntentsBasicSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -24,14 +24,14 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    androidxCoreVersion = "1.9.0"
+    androidxAnnotationVersion = "1.9.1"
+    androidxCoreVersion = "1.15.0"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
     extJUnitVersion = "1.2.1"
     extTruthVersion = "1.6.0"
-    robolectricVersion = "4.13"
+    robolectricVersion = "4.14.1"
 }
diff --git a/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle
index c6f0b506e..01553a517 100644
--- a/ui/espresso/MultiProcessSample/app/build.gradle
+++ b/ui/espresso/MultiProcessSample/app/build.gradle
@@ -17,11 +17,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.multiprocesssample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
     androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
     androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
index 370d04433..369f6d27e 100644
--- a/ui/espresso/MultiProcessSample/build.gradle
+++ b/ui/espresso/MultiProcessSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -47,7 +47,7 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties
index 05697bdc1..6e99fcbc4 100644
--- a/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle
index c3653ba44..7dbbafecb 100644
--- a/ui/espresso/MultiWindowSample/app/build.gradle
+++ b/ui/espresso/MultiWindowSample/app/build.gradle
@@ -2,11 +2,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.MultiWindowSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle
index 89808fc94..5add135ed 100644
--- a/ui/espresso/MultiWindowSample/build.gradle
+++ b/ui/espresso/MultiWindowSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -25,11 +25,11 @@ allprojects {
 
 ext {
     buildToolsVersion = "32.0.0"
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle
index 498d3fb96..4c5a0d2b6 100644
--- a/ui/espresso/RecyclerViewSample/app/build.gradle
+++ b/ui/espresso/RecyclerViewSample/app/build.gradle
@@ -17,11 +17,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.RecyclerViewSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
index 598991235..7d84fa214 100644
--- a/ui/espresso/RecyclerViewSample/build.gradle
+++ b/ui/espresso/RecyclerViewSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -40,12 +40,12 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    androidxRecyclerVersion = "1.2.1"
+    androidxAnnotationVersion = "1.9.1"
+    androidxRecyclerVersion = "1.3.2"
     guavaVersion = "31.1-android"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/ScreenshotSample/app/build.gradle b/ui/espresso/ScreenshotSample/app/build.gradle
index 0d476e0bc..f512a07b7 100644
--- a/ui/espresso/ScreenshotSample/app/build.gradle
+++ b/ui/espresso/ScreenshotSample/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.android.testing.espresso.screenshotsample"
-        minSdk 19
-        targetSdkVersion 34
+        minSdk 21
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -54,11 +54,11 @@ dependencies {
 
     implementation "androidx.core:core-ktx:$androidxCoreVersion"
     implementation "androidx.appcompat:appcompat:$androidxCompatVersion"
-    implementation "com.google.android.material:material:1.4.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.1"
+    implementation "com.google.android.material:material:1.12.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.2.0"
     // force upgrade to 1.1.0 because its required by androidTestImplementation,
     // and without this statement AGP will silently downgrade to tracing:1.0.0
-    implementation "androidx.tracing:tracing:1.1.0"
+    implementation "androidx.tracing:tracing:1.2.0"
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test.ext:junit-ktx:$extJUnitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
index d2d1f7450..37a219b94 100644
--- a/ui/espresso/ScreenshotSample/build.gradle
+++ b/ui/espresso/ScreenshotSample/build.gradle
@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     ext.kotlinVersion = "1.9.22"
-    ext.androidxCoreVersion = "1.9.0"
+    ext.androidxCoreVersion = "1.15.0"
     ext.buildToolsVersion = "32.0.0"
-    ext.androidxCompatVersion = "1.5.1"
+    ext.androidxCompatVersion = "1.7.0"
     ext.coreVersion = "1.6.1"
     ext.extJUnitVersion = "1.2.1"
     ext.runnerVersion = "1.6.1"
diff --git a/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties
index 6cc5d8679..9e32e31f0 100644
--- a/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 01 20:15:00 UTC 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle
index 6c79f8355..5132eb013 100644
--- a/ui/espresso/WebBasicSample/app/build.gradle
+++ b/ui/espresso/WebBasicSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.espresso.web.BasicSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle
index ff7dd3c0f..04e68a9ad 100644
--- a/ui/espresso/WebBasicSample/build.gradle
+++ b/ui/espresso/WebBasicSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -24,11 +24,11 @@ allprojects {
 }
 
 ext {
-    androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    androidxAnnotationVersion = "1.9.1"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle
index 2f256a12d..4104ba0db 100644
--- a/ui/uiautomator/BasicSample/app/build.gradle
+++ b/ui/uiautomator/BasicSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.example.android.testing.uiautomator.BasicSample"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle
index 8db56e0ee..b12a82181 100644
--- a/ui/uiautomator/BasicSample/build.gradle
+++ b/ui/uiautomator/BasicSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.5.0"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -23,10 +23,10 @@ allprojects {
 ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
-    guavaVersion = "31.1-android"
+    guavaVersion = "33.3.1-jre"
     coreVersion = "1.6.1"
     extJUnitVersion = "1.2.1"
-    runnerVersion = "1.6.1"
+    runnerVersion = "1.6.2"
     rulesVersion = "1.6.1"
     espressoVersion = "3.6.1"
     uiAutomatorVersion = "2.3.0"
diff --git a/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/unit/BasicNativeAndroidTest/app/build.gradle b/unit/BasicNativeAndroidTest/app/build.gradle
index bc4c1c1a3..31aef5233 100644
--- a/unit/BasicNativeAndroidTest/app/build.gradle
+++ b/unit/BasicNativeAndroidTest/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.android.testing.nativesample"
-        minSdk 18
-        targetSdk 33
+        minSdk 21
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle
index ada2e810f..e574132c9 100644
--- a/unit/BasicNativeAndroidTest/build.gradle
+++ b/unit/BasicNativeAndroidTest/build.gradle
@@ -1,19 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = "8.1.1"
-    ext.kotlinVersion = "1.7.10"
+    ext.agpVersion = "8.7.3"
+    ext.kotlinVersion = "2.1.0"
     ext.androidxCoreVersion = "1.9.0"
     ext.buildToolsVersion = "32.0.0"
     ext.androidxCompatVersion = "1.5.1"
     ext.coreVersion = "1.6.0-alpha01"
-    ext.extJUnitVersion = "1.2.0-alpha01"
-    ext.runnerVersion = "1.6.0-alpha03"
+    ext.extJUnitVersion = "1.2.1"
+    ext.runnerVersion = "1.6.2"
     ext.rulesVersion = "1.6.0-alpha01"
     ext.espressoVersion = "3.6.0-alpha01"
     ext.servicesVersion = "1.5.0-alpha01"
     ext.truthVersion = "1.1.3"
     ext.googletestVersion = "1.11.0-beta-1"
-    ext.junitGtestVersion = "1.0.0-alpha01"
+    ext.junitGtestVersion = "1.0.0-alpha02"
     ext.junitVersion = "4.13.2"
 
     repositories {
diff --git a/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties
index bf2443383..d4f896477 100644
--- a/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties
+++ b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Sep 30 12:30:46 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/unit/BasicSample-kotlinApp/app/build.gradle b/unit/BasicSample-kotlinApp/app/build.gradle
index 6f7985560..d7a43b912 100644
--- a/unit/BasicSample-kotlinApp/app/build.gradle
+++ b/unit/BasicSample-kotlinApp/app/build.gradle
@@ -5,13 +5,13 @@ apply plugin: "kotlin-android"
 apply plugin: "kotlin-android-extensions"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 35
     defaultConfig {
         applicationId "com.example.android.testing.unittesting.BasicSample"
-        minSdkVersion 14
+        minSdkVersion 21
         versionCode 1
         versionName "1.0"
-        targetSdkVersion 27
+        targetSdkVersion 35
     }
 }
 
@@ -19,6 +19,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
 
     // Unit testing dependencies.
-    testImplementation "junit:junit:4.12"
-    testImplementation "org.mockito:mockito-core:2.8.9"
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.mockito:mockito-core:5.14.2"
 }
diff --git a/unit/BasicSample-kotlinApp/build.gradle b/unit/BasicSample-kotlinApp/build.gradle
index 683dc0b55..d76cd57c2 100644
--- a/unit/BasicSample-kotlinApp/build.gradle
+++ b/unit/BasicSample-kotlinApp/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.5.2"
+        classpath "com.android.tools.build:gradle:8.7.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
diff --git a/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.jar b/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4..a4b76b953 100644
Binary files a/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.jar and b/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.properties b/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.properties
index b1159fc54..c1d5e0185 100644
--- a/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.properties
+++ b/unit/BasicSample-kotlinApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/unit/BasicSample-kotlinApp/gradlew b/unit/BasicSample-kotlinApp/gradlew
index 1b6c78733..f5feea6d6 100755
--- a/unit/BasicSample-kotlinApp/gradlew
+++ b/unit/BasicSample-kotlinApp/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +217,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/unit/BasicSample-kotlinApp/gradlew.bat b/unit/BasicSample-kotlinApp/gradlew.bat
index ac1b06f93..9b42019c7 100644
--- a/unit/BasicSample-kotlinApp/gradlew.bat
+++ b/unit/BasicSample-kotlinApp/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/unit/BasicSample/app/build.gradle b/unit/BasicSample/app/build.gradle
index 93dc98147..b659be89c 100644
--- a/unit/BasicSample/app/build.gradle
+++ b/unit/BasicSample/app/build.gradle
@@ -17,14 +17,14 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 35
     buildToolsVersion = rootProject.buildToolsVersion
     defaultConfig {
         applicationId "com.example.android.testing.unittesting.BasicSample"
-        minSdkVersion 14
+        minSdkVersion 21
         versionCode 1
         versionName "1.0"
-        targetSdkVersion 30
+        targetSdkVersion 35
     }
     productFlavors {
     }
diff --git a/unit/BasicSample/build.gradle b/unit/BasicSample/build.gradle
index 772c3d2a6..aea59f16e 100644
--- a/unit/BasicSample/build.gradle
+++ b/unit/BasicSample/build.gradle
@@ -16,7 +16,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = "7.3.0-alpha07"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -40,6 +40,6 @@ allprojects {
 
 ext {
     buildToolsVersion = "31.0.0"
-    junitVersion = "4.12"
-    mockitoVersion = "1.10.19"
+    junitVersion = "4.13.2"
+    mockitoVersion = "5.14.2"
 }
diff --git a/unit/BasicSample/gradle/wrapper/gradle-wrapper.jar b/unit/BasicSample/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4..a4b76b953 100644
Binary files a/unit/BasicSample/gradle/wrapper/gradle-wrapper.jar and b/unit/BasicSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/unit/BasicSample/gradle/wrapper/gradle-wrapper.properties b/unit/BasicSample/gradle/wrapper/gradle-wrapper.properties
index b1159fc54..c1d5e0185 100644
--- a/unit/BasicSample/gradle/wrapper/gradle-wrapper.properties
+++ b/unit/BasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/unit/BasicSample/gradlew b/unit/BasicSample/gradlew
index 1b6c78733..f5feea6d6 100755
--- a/unit/BasicSample/gradlew
+++ b/unit/BasicSample/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +217,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/unit/BasicSample/gradlew.bat b/unit/BasicSample/gradlew.bat
index ac1b06f93..9b42019c7 100644
--- a/unit/BasicSample/gradlew.bat
+++ b/unit/BasicSample/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle
index 2dc4855b8..bc32cfbda 100644
--- a/unit/BasicUnitAndroidTest/build.gradle
+++ b/unit/BasicUnitAndroidTest/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.7.3"
     repositories {
         // Insert local test repo here
         google()
@@ -26,9 +26,9 @@ allprojects {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.2"
     hamcrestVersion = "1.3"
-    truthVersion = "1.1.3"
+    truthVersion = "1.4.4"
 }
diff --git a/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca..81aa1c044 100644
--- a/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties
+++ b/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists