diff --git a/.editorconfig b/.editorconfig
index 7be3f8784..6c8c930bc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,13 @@
 ij_kotlin_allow_trailing_comma=true
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ktlint_function_naming_ignore_when_annotated_with=Composable, Test
+ktlint_standard_backing-property-naming = disabled
+ktlint_standard_binary-expression-wrapping = disabled
+ktlint_standard_chain-method-continuation = disabled
+ktlint_standard_class-signature = disabled
+ktlint_standard_condition-wrapping = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_function-literal = disabled
+ktlint_standard_function-type-modifier-spacing = disabled
+ktlint_standard_multiline-loop = disabled
+ktlint_standard_function-signature = disabled
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index c67d3b3d8..b1aee6f66 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -235,7 +235,7 @@ jobs:
       - name: Display local test coverage (only API 30)
         if: matrix.api-level == 30
         id: jacoco
-        uses: madrapps/jacoco-report@v1.7.0
+        uses: madrapps/jacoco-report@v1.7.1
         with:
           title: Combined test coverage report
           min-coverage-overall: 40
diff --git a/README.md b/README.md
index 1f5270323..83bf139be 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ To run the tests execute the following gradle tasks:
 - `connectedDemoDebugAndroidTest` run all instrumented tests against the `demoDebug` variant. 
 
 **Note:** You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute 
-tests against _all_ build variants which is both unecessary and will result in failures as only the
+tests against _all_ build variants which is both unnecessary and will result in failures as only the
 `demoDebug` variant is supported. No other variants have any tests (although this might change in future). 
 
 ## Screenshot tests
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1e4361008..5434df8c2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -123,7 +123,6 @@ dependencies {
     testDemoImplementation(libs.roborazzi)
     testDemoImplementation(projects.core.screenshotTesting)
 
-    androidTestImplementation(kotlin("test"))
     androidTestImplementation(projects.core.testing)
     androidTestImplementation(projects.core.dataTest)
     androidTestImplementation(projects.core.datastoreTest)
@@ -131,6 +130,7 @@ dependencies {
     androidTestImplementation(libs.androidx.navigation.testing)
     androidTestImplementation(libs.androidx.compose.ui.test)
     androidTestImplementation(libs.hilt.android.testing)
+    androidTestImplementation(libs.kotlin.test)
 
     baselineProfile(projects.benchmarks)
 }
diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt
index 49ab75cec..a2719ef22 100644
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@@ -145,7 +145,7 @@ androidx.work:work-runtime-ktx:2.9.0
 androidx.work:work-runtime:2.9.0
 com.caverock:androidsvg-aar:1.4
 com.google.accompanist:accompanist-drawablepainter:0.32.0
-com.google.accompanist:accompanist-permissions:0.34.0
+com.google.accompanist:accompanist-permissions:0.36.0
 com.google.android.datatransport:transport-api:3.2.0
 com.google.android.datatransport:transport-backend-cct:3.3.0
 com.google.android.datatransport:transport-runtime:3.3.0
@@ -194,8 +194,8 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.1-android
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.protobuf:protobuf-javalite:4.26.1
-com.google.protobuf:protobuf-kotlin-lite:4.26.1
+com.google.protobuf:protobuf-javalite:4.28.2
+com.google.protobuf:protobuf-kotlin-lite:4.28.2
 com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index 71d818c0c..2a10901fb 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -53,8 +53,8 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 disableUnnecessaryAndroidTests(target)
             }
             dependencies {
-                add("androidTestImplementation", kotlin("test"))
-                add("testImplementation", kotlin("test"))
+                add("androidTestImplementation", libs.findLibrary("kotlin.test").get())
+                add("testImplementation", libs.findLibrary("kotlin.test").get())
 
                 add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
             }
diff --git a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
index 652409db6..afe47eeee 100644
--- a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
@@ -15,6 +15,7 @@
  */
 
 import com.google.samples.apps.nowinandroid.configureKotlinJvm
+import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -29,7 +30,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
             }
             configureKotlinJvm()
             dependencies {
-                add("testImplementation", kotlin("test"))
+                add("testImplementation", libs.findLibrary("kotlin.test").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt
index d0c26e4e6..c51dac5c9 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt
@@ -30,6 +30,6 @@ import org.gradle.api.Project
 internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests(
     project: Project,
 ) = beforeVariants {
-    it.enableAndroidTest = it.enableAndroidTest
+    it.androidTest.enable = it.androidTest.enable
         && project.projectDir.resolve("src/androidTest").exists()
 }
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index de9224e22..b359a5207 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -16,7 +16,13 @@
 
 dependencyResolutionManagement {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
     }
     versionCatalogs {
diff --git a/build.gradle.kts b/build.gradle.kts
index fbcefa906..9a8652956 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,13 @@
 
 buildscript {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
 
         // Android Build Server
diff --git a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
index 40f54e4a7..dd01b84c9 100644
--- a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
+++ b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
@@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.feature.bookmarks
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.filter
@@ -33,6 +32,7 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollToNode
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.testing.TestLifecycleOwner
 import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
 import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
index fe79fa01e..44dc41200 100644
--- a/gradle/init.gradle.kts
+++ b/gradle/init.gradle.kts
@@ -14,10 +14,10 @@
  *   limitations under the License.
  */
 
-val ktlintVersion = "1.0.1"
+val ktlintVersion = "1.4.0"
 
 initscript {
-    val spotlessVersion = "6.23.3"
+    val spotlessVersion = "6.25.0"
 
     repositories {
         mavenCentral()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ba4299b6b..25a7183ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-accompanist = "0.34.0"
+accompanist = "0.36.0"
 androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
 androidGradlePlugin = "8.6.1"
@@ -8,14 +8,14 @@ androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"
 androidxComposeBom = "2024.11.00"
-androidxComposeRuntimeTracing = "1.0.0-beta01"
+androidxComposeRuntimeTracing = "1.7.5"
 androidxCore = "1.13.1"
 androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.1.1"
 androidxEspresso = "3.6.1"
 androidxHiltNavigationCompose = "1.2.0"
 androidxLifecycle = "2.8.6"
-androidxMacroBenchmark = "1.3.0"
+androidxMacroBenchmark = "1.3.1"
 androidxMetrics = "1.0.0-beta01"
 androidxNavigation = "2.8.0"
 androidxProfileinstaller = "1.3.1"
@@ -30,14 +30,14 @@ androidxWork = "2.9.0"
 coil = "2.7.0"
 dependencyGuard = "0.5.0"
 firebaseBom = "33.3.0"
-firebaseCrashlyticsPlugin = "2.9.9"
+firebaseCrashlyticsPlugin = "3.0.2"
 firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.4.1"
 googleOss = "17.1.0"
 googleOssPlugin = "0.10.6"
 hilt = "2.52"
 hiltExt = "1.2.0"
-jacoco = "0.8.7"
+jacoco = "0.8.12"
 junit4 = "4.13.2"
 kotlin = "2.0.20"
 kotlinxCoroutines = "1.9.0"
@@ -46,15 +46,15 @@ kotlinxSerializationJson = "1.6.3"
 ksp = "2.0.20-1.0.25"
 moduleGraph = "2.7.1"
 okhttp = "4.12.0"
-protobuf = "4.26.1"
+protobuf = "4.28.2"
 protobufPlugin = "0.9.4"
 retrofit = "2.11.0"
 retrofitKotlinxSerializationJson = "1.0.0"
-robolectric = "4.12.2"
+robolectric = "4.11.1"
 roborazzi = "1.7.0"
 room = "2.6.1"
 secrets = "2.0.1"
-truth = "1.4.2"
+truth = "1.4.4"
 turbine = "1.1.0"
 
 [bundles]
diff --git a/lint/build.gradle.kts b/lint/build.gradle.kts
index 99a057362..f1722fa78 100644
--- a/lint/build.gradle.kts
+++ b/lint/build.gradle.kts
@@ -38,7 +38,7 @@ kotlin {
 dependencies {
     compileOnly(libs.kotlin.stdlib)
     compileOnly(libs.lint.api)
+    testImplementation(libs.kotlin.test)
     testImplementation(libs.lint.checks)
     testImplementation(libs.lint.tests)
-    testImplementation(kotlin("test"))
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 465a72616..2b8c6e45c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,13 @@
 pluginManagement {
     includeBuild("build-logic")
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }
@@ -26,7 +32,13 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
     }
 }