diff --git a/baseline-profiles/gradle/libs.versions.toml b/baseline-profiles/gradle/libs.versions.toml
index 2f0a7cc..13f76fd 100644
--- a/baseline-profiles/gradle/libs.versions.toml
+++ b/baseline-profiles/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-accompanist = "0.36.0"
-androidGradlePlugin = "8.7.3"
-androidx-activity-compose = "1.9.3"
+accompanist = "0.37.2"
+androidGradlePlugin = "8.9.1"
+androidx-activity-compose = "1.10.1"
 androidx-appcompat = "1.7.0"
 androidx-benchmark = "1.2.4"
-androidx-benchmark-junit4 = "1.3.3"
-androidx-compose-bom = "2024.12.01"
-androidx-constraintlayout = "1.1.0"
-androidx-corektx = "1.15.0"
+androidx-benchmark-junit4 = "1.3.4"
+androidx-compose-bom = "2025.04.00"
+androidx-constraintlayout = "1.1.1"
+androidx-corektx = "1.16.0"
 androidx-lifecycle-runtime = "2.8.7"
 androidx-lifecycle-compose = "2.8.7"
 androidx-lifecycle-runtime-compose = "2.8.7"
-androidx-navigation = "2.8.5"
+androidx-navigation = "2.8.9"
 androidx-palette = "1.0.0"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
@@ -23,31 +23,31 @@ androix-test-uiautomator = "2.3.0"
 coil = "2.7.0"
 # @keep
 compileSdk = "33"
-coroutines = "1.9.0"
-google-maps = "19.0.0"
-gradle-versions = "0.51.0"
-hilt = "2.53.1"
+coroutines = "1.10.2"
+google-maps = "19.2.0"
+gradle-versions = "0.52.0"
+hilt = "2.56.2"
 hiltExt = "1.2.0"
 # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
-jdkDesugar = "2.1.3"
+jdkDesugar = "2.1.5"
 junit = "4.13.2"
 # @pin Update in conjuction with Compose Compiler
-kotlin = "2.1.0"
-ksp = "2.1.0-1.0.29"
-maps-compose = "6.4.0"
+kotlin = "2.1.20"
+ksp = "2.1.20-2.0.0"
+maps-compose = "6.5.3"
 material = "1.12.0"
 # @keep
 minSdk = "21"
 okhttp = "4.12.0"
 robolectric = "4.14.1"
 rome = "2.1.0"
-room = "2.6.1"
-runtimeTracing = "1.7.6"
+room = "2.7.0"
+runtimeTracing = "1.7.8"
 secrets = "2.0.1"
 # @keep
 targetSdk = "33"
-version-catalog-update = "0.8.5"
-androidx-baselineprofile = "1.3.3"
+version-catalog-update = "1.0.0"
+androidx-baselineprofile = "1.3.4"
 profileinstaller = "1.4.1"
 
 [libraries]
diff --git a/baseline-profiles/gradle/spotless.gradle.kts b/baseline-profiles/gradle/spotless.gradle.kts
index f7abf08..8658af3 100644
--- a/baseline-profiles/gradle/spotless.gradle.kts
+++ b/baseline-profiles/gradle/spotless.gradle.kts
@@ -17,7 +17,7 @@
 val ktlintVersion = "0.43.0"
 
 initscript {
-    val spotlessVersion = "6.25.0"
+    val spotlessVersion = "7.0.3"
 
     repositories {
         mavenCentral()
diff --git a/baseline-profiles/gradle/wrapper/gradle-wrapper.jar b/baseline-profiles/gradle/wrapper/gradle-wrapper.jar
index a4b76b9..9bbc975 100644
Binary files a/baseline-profiles/gradle/wrapper/gradle-wrapper.jar and b/baseline-profiles/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/baseline-profiles/gradle/wrapper/gradle-wrapper.properties b/baseline-profiles/gradle/wrapper/gradle-wrapper.properties
index e2847c8..37f853b 100644
--- a/baseline-profiles/gradle/wrapper/gradle-wrapper.properties
+++ b/baseline-profiles/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/baseline-profiles/gradlew b/baseline-profiles/gradlew
index f5feea6..faf9300 100755
--- a/baseline-profiles/gradlew
+++ b/baseline-profiles/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 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,
+#   * DEFAULT_JVM_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.
diff --git a/benchmarking/gradle/libs.versions.toml b/benchmarking/gradle/libs.versions.toml
index ffe23fd..bffd9c3 100644
--- a/benchmarking/gradle/libs.versions.toml
+++ b/benchmarking/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-accompanist = "0.36.0"
-androidGradlePlugin = "8.7.3"
-androidx-activity-compose = "1.9.3"
+accompanist = "0.37.2"
+androidGradlePlugin = "8.9.1"
+androidx-activity-compose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-benchmark = "1.3.3"
-androidx-benchmark-junit4 = "1.3.3"
-androidx-compose-bom = "2024.12.01"
-androidx-constraintlayout = "1.1.0"
-androidx-corektx = "1.15.0"
+androidx-benchmark = "1.3.4"
+androidx-benchmark-junit4 = "1.3.4"
+androidx-compose-bom = "2025.04.00"
+androidx-constraintlayout = "1.1.1"
+androidx-corektx = "1.16.0"
 androidx-lifecycle-runtime = "2.8.7"
 androidx-lifecycle-compose = "2.8.7"
 androidx-lifecycle-runtime-compose = "2.8.7"
-androidx-navigation = "2.8.5"
+androidx-navigation = "2.8.9"
 androidx-palette = "1.0.0"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
@@ -24,18 +24,18 @@ benchmarkMacroJunit4 = "1.2.0"
 coil = "2.7.0"
 # @keep
 compileSdk = "33"
-coroutines = "1.9.0"
-google-maps = "19.0.0"
-gradle-versions = "0.51.0"
-hilt = "2.53.1"
+coroutines = "1.10.2"
+google-maps = "19.2.0"
+gradle-versions = "0.52.0"
+hilt = "2.56.2"
 hiltExt = "1.2.0"
 # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
-jdkDesugar = "2.1.3"
+jdkDesugar = "2.1.5"
 junit = "4.13.2"
 # @pin Update in conjuction with Compose Compiler
-kotlin = "2.1.0"
-ksp = "2.1.0-1.0.29"
-maps-compose = "6.4.0"
+kotlin = "2.1.20"
+ksp = "2.1.20-2.0.0"
+maps-compose = "6.5.3"
 material = "1.12.0"
 # @keep
 minSdk = "21"
@@ -43,12 +43,12 @@ okhttp = "4.12.0"
 profileinstaller = "1.4.1"
 robolectric = "4.14.1"
 rome = "2.1.0"
-room = "2.6.1"
-runtimeTracing = "1.7.6"
+room = "2.7.0"
+runtimeTracing = "1.7.8"
 secrets = "2.0.1"
 # @keep
 targetSdk = "33"
-version-catalog-update = "0.8.5"
+version-catalog-update = "1.0.0"
 
 [libraries]
 accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
diff --git a/benchmarking/gradle/spotless.gradle.kts b/benchmarking/gradle/spotless.gradle.kts
index f7abf08..8658af3 100644
--- a/benchmarking/gradle/spotless.gradle.kts
+++ b/benchmarking/gradle/spotless.gradle.kts
@@ -17,7 +17,7 @@
 val ktlintVersion = "0.43.0"
 
 initscript {
-    val spotlessVersion = "6.25.0"
+    val spotlessVersion = "7.0.3"
 
     repositories {
         mavenCentral()
diff --git a/benchmarking/gradle/wrapper/gradle-wrapper.jar b/benchmarking/gradle/wrapper/gradle-wrapper.jar
index a4b76b9..9bbc975 100644
Binary files a/benchmarking/gradle/wrapper/gradle-wrapper.jar and b/benchmarking/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/benchmarking/gradle/wrapper/gradle-wrapper.properties b/benchmarking/gradle/wrapper/gradle-wrapper.properties
index e2847c8..37f853b 100644
--- a/benchmarking/gradle/wrapper/gradle-wrapper.properties
+++ b/benchmarking/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/benchmarking/gradlew b/benchmarking/gradlew
index f5feea6..faf9300 100755
--- a/benchmarking/gradlew
+++ b/benchmarking/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 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,
+#   * DEFAULT_JVM_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.