diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5107942ce..348be9c6c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,12 @@
 [versions]
-# 7.0.0 is JDK 17+ https://github.com/bndtools/bnd/wiki/Changes-in-7.0.0
+agp = "8.12.0"
 biz-aQute-bnd = "7.1.0"
 checkStyle = "11.0.0"
 com-squareup-moshi = "1.15.2"
 com-squareup-okio = "3.16.0"
 de-mannodermaus-junit5 = "1.8.0"
 graalvm = "24.2.2"
+#noinspection UnusedVersionCatalogEntry
 junit-platform = "1.13.4"
 kotlinx-serialization = "1.9.0"
 ksp = "2.2.10-2.0.2"
@@ -26,6 +27,7 @@ androidx-activity = "androidx.activity:activity-ktx:1.10.1"
 androidx-annotation = "androidx.annotation:annotation:1.9.1"
 androidx-espresso-core = "androidx.test.espresso:espresso-core:3.7.0"
 androidx-junit = "androidx.test.ext:junit:1.3.0"
+#noinspection UnusedVersionCatalogEntry
 androidx-lint-gradle = { module = "androidx.lint:lint-gradle", version.ref = "lintGradle" }
 androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "startupRuntime" }
 androidx-test-runner = "androidx.test:runner:1.7.0"
@@ -36,15 +38,16 @@ bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.re
 bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "org-bouncycastle" }
 bouncycastle-bctls = { module = "org.bouncycastle:bctls-jdk15to18", version.ref = "org-bouncycastle" }
 brotli-dec = "org.brotli:dec:0.1.2"
+#noinspection UnusedVersionCatalogEntry
 checkStyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkStyle" }
 clikt = "com.github.ajalt.clikt:clikt:5.0.3"
+#noinspection UnusedVersionCatalogEntry
 codehaus-signature-java18 = "org.codehaus.mojo.signature:java18:1.0"
 conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "org-conscrypt" }
 conscrypt-openjdk = { module = "org.conscrypt:conscrypt-openjdk-uber", version.ref = "org-conscrypt" }
 converter-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
 eclipseOsgi = "org.eclipse.platform:org.eclipse.osgi:3.23.100"
-graal-sdk = { module = "org.graalvm.sdk:graal-sdk", version.ref = "graalvm" }
-gradlePlugin-android = "com.android.tools.build:gradle:8.12.0"
+gradlePlugin-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 gradlePlugin-androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.13.1.0"
 gradlePlugin-animalsniffer = "ru.vyarus:gradle-animalsniffer-plugin:2.0.1"
 gradlePlugin-binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.18.1"
@@ -61,6 +64,7 @@ gradlePlugin-shadow = "com.gradleup.shadow:shadow-gradle-plugin:9.0.2"
 gradlePlugin-spotless = "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
 hamcrestLibrary = "org.hamcrest:hamcrest-library:3.0"
 httpClient5 = "org.apache.httpcomponents.client5:httpclient5:5.5"
+#noinspection NewerVersionAvailable
 jettyClient = "org.eclipse.jetty:jetty-client:9.4.58.v20250814"
 jnr-unixsocket = "com.github.jnr:jnr-unixsocket:0.38.23"
 jsoup = "org.jsoup:jsoup:1.21.1"
@@ -69,9 +73,12 @@ junit-ktx = "androidx.test.ext:junit-ktx:1.3.0"
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit-jupiter" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "org-junit-jupiter" }
+#noinspection UnusedVersionCatalogEntry
 junit-platform-console = { module = "org.junit.platform:junit-platform-console", version.ref = "junit-platform" }
+#noinspection UnusedVersionCatalogEntry
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
 junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "org-junit-jupiter" }
+#noinspection NewerVersionAvailable
 junit-pioneer = "org.junit-pioneer:junit-pioneer:1.9.1"
 junit5android-core = { module = "de.mannodermaus.junit5:android-test-core", version.ref = "de-mannodermaus-junit5" }
 junit5android-runner = { module = "de.mannodermaus.junit5:android-test-runner", version.ref = "de-mannodermaus-junit5" }
@@ -94,16 +101,16 @@ playservices-safetynet = "com.google.android.gms:play-services-safetynet:18.1.0"
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 robolectric-android = "org.robolectric:android-all:16-robolectric-13785805"
 robolectric = "org.robolectric:robolectric:4.15.1"
+#noinspection UnusedVersionCatalogEntry
 signature-android-apilevel21 = "net.sf.androidscents.signature:android-api-level-21:5.0.1_r2"
+#noinspection UnusedVersionCatalogEntry
 signature-android-apilevel24 = "net.sf.androidscents.signature:android-api-level-24:7.0_r2"
 squareup-moshi = { module = "com.squareup.moshi:moshi", version.ref = "com-squareup-moshi" }
 squareup-moshi-compiler = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "com-squareup-moshi" }
 squareup-moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "com-squareup-moshi" }
-squareup-okhttp-icu = "com.squareup.okhttpicu:okhttp-icu:0.2.0"
 squareup-kotlinPoet = "com.squareup:kotlinpoet:2.2.0"
 squareup-okio = { module = "com.squareup.okio:okio", version.ref = "com-squareup-okio" }
 squareup-okio-fakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version.ref = "com-squareup-okio" }
-squareup-okio-nodefilesystem = { module = "com.squareup.okio:okio-nodefilesystem", version.ref = "com-squareup-okio" }
 testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
 testcontainers-junit5 = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
 zstd-kmp-okio = { module = "com.squareup.zstd:zstd-kmp-okio", version = "0.3.0" }