diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 0e6772b3..8ca82c67 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -213,7 +213,10 @@
             <trusting group="com.github.spotbugs.snom" name="spotbugs-gradle-plugin" version="6.1.6"/>
             <trusting group="com.github.spotbugs.snom" name="spotbugs-gradle-plugin" version="6.1.7"/>
          </trusted-key>
-         <trusted-key id="9E3044071B758EBCB7E45673700E4F39BC05364B" group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
+         <trusted-key id="9E3044071B758EBCB7E45673700E4F39BC05364B">
+            <trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
+            <trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
+         </trusted-key>
          <trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="com.google.code.findbugs" name="jsr305" version="2.0.2"/>
          <trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8" name="kubernetes-client-bom" version="5.12.4"/>
@@ -7563,6 +7566,11 @@
             <sha256 value="58b0b4ed49b3b19072b55c7111c0991a07f9b6d20709af8aa470c714114afbfb" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.2.1">
+         <artifact name="com.diffplug.spotless.gradle.plugin-8.2.1.pom">
+            <sha256 value="306b777dc39f44fec62b50bdefe41b716beb0fd7cd3f81572273a134c2e155b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml" name="oss-parent" version="56">
          <artifact name="oss-parent-56.pom">
             <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -11674,11 +11682,24 @@
             <sha256 value="5f0c0e2cdbd6d788302fa84b28d0c538a06334ba0812fc64252050907222d30b" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit" version="7.5.0.202512021534-r">
+         <artifact name="org.eclipse.jgit-7.5.0.202512021534-r.jar">
+            <sha256 value="1597bc78a8d8c0116976d46a94872a2cc2865670eba4db0b9f51811b34936d72" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="org.eclipse.jgit-7.5.0.202512021534-r.pom">
+            <sha256 value="6c954dfc10f1c301bdba25d3d6309f77479804363cf7556e51e8bb3714555c64" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="7.4.0.202509020913-r">
          <artifact name="org.eclipse.jgit-parent-7.4.0.202509020913-r.pom">
             <sha256 value="d53714ed2649b8173288f65405e54fbef751656b91480c5459f4dc0192002472" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="7.5.0.202512021534-r">
+         <artifact name="org.eclipse.jgit-parent-7.5.0.202512021534-r.pom">
+            <sha256 value="7e38806a853691a49db16eac836fe6b626276943b108b67754a3d5c740fbbc0e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200">
          <artifact name="org.eclipse.osgi-3.23.200.jar">
             <sha256 value="8d94058ead3f4651900166924a677c3beb6e996f072fabf385ffdd70510bc493" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -11687,6 +11708,14 @@
             <sha256 value="a72da35afde481cda10e9d94b31a54c1b90a7b6850aade4c9ad9e956d7485ad0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0">
+         <artifact name="org.eclipse.osgi-3.24.0.jar">
+            <sha256 value="789454014c150f2adf681cd80f8ecf49817d93ed790f3659b362dca07ade87b8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="org.eclipse.osgi-3.24.0.pom">
+            <sha256 value="a24d9d906a478e126b219a9d24518b833b66da4b103f963e20b9050bebe2ae15" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.glassfish.jaxb" name="jaxb-bom" version="2.3.2">
          <artifact name="jaxb-bom-2.3.2.pom">
             <sha256 value="a1018bb54678ed9f5acb2f7a4084e385ff510201f4e9dbf5f75dc6a675f66be7" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
diff --git a/lib/build.gradle b/lib/build.gradle
index dcee8d20..1cd17253 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-    id "com.diffplug.spotless" version "8.1.0"
+    id "com.diffplug.spotless" version "8.2.1"
 }
 
 apply plugin: "kotlin-android"
diff --git a/lib/src/test/java/com/nextcloud/android/sso/helper/Retrofit2HelperTest.kt b/lib/src/test/java/com/nextcloud/android/sso/helper/Retrofit2HelperTest.kt
index 2d2e22ad..1e3daca5 100644
--- a/lib/src/test/java/com/nextcloud/android/sso/helper/Retrofit2HelperTest.kt
+++ b/lib/src/test/java/com/nextcloud/android/sso/helper/Retrofit2HelperTest.kt
@@ -15,7 +15,6 @@ import org.junit.Test
 
 @Suppress("MagicNumber", "TooManyFunctions")
 class Retrofit2HelperTest {
-
     @Test
     fun testBuildHeadersWhenGivenNullHeadersShouldReturnEmptyHeaders() {
         val headers = buildHeaders(null)
@@ -30,9 +29,10 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenSingleHeaderShouldReturnThatHeader() {
-        val plainHeaders = listOf(
-            createPlainHeader("Content-Type", "application/json")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Content-Type", "application/json")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -42,11 +42,12 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenDuplicateHeadersShouldRemoveDuplicates() {
-        val plainHeaders = listOf(
-            createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
-            createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
-            createPlainHeader("X-Robots-Tag", "noindex, nofollow")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
+                createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
+                createPlainHeader("X-Robots-Tag", "noindex, nofollow")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -56,11 +57,12 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenMultipleDistinctValuesShouldKeepAllValues() {
-        val plainHeaders = listOf(
-            createPlainHeader("Set-Cookie", "session=abc123"),
-            createPlainHeader("Set-Cookie", "token=xyz789"),
-            createPlainHeader("Set-Cookie", "user=john")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Set-Cookie", "session=abc123"),
+                createPlainHeader("Set-Cookie", "token=xyz789"),
+                createPlainHeader("Set-Cookie", "user=john")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -74,13 +76,14 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenMixedDuplicateAndDistinctValuesShouldHandleCorrectly() {
-        val plainHeaders = listOf(
-            createPlainHeader("Set-Cookie", "session=abc"),
-            createPlainHeader("Set-Cookie", "session=abc"),
-            createPlainHeader("Set-Cookie", "token=xyz"),
-            createPlainHeader("X-Robots-Tag", "noindex"),
-            createPlainHeader("X-Robots-Tag", "noindex")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Set-Cookie", "session=abc"),
+                createPlainHeader("Set-Cookie", "session=abc"),
+                createPlainHeader("Set-Cookie", "token=xyz"),
+                createPlainHeader("X-Robots-Tag", "noindex"),
+                createPlainHeader("X-Robots-Tag", "noindex")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -96,11 +99,12 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenCaseInsensitiveHeaderNamesShouldTreatAsSame() {
-        val plainHeaders = listOf(
-            createPlainHeader("Content-Type", "application/json"),
-            createPlainHeader("content-type", "application/json"),
-            createPlainHeader("CONTENT-TYPE", "application/json")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Content-Type", "application/json"),
+                createPlainHeader("content-type", "application/json"),
+                createPlainHeader("CONTENT-TYPE", "application/json")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -110,11 +114,12 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenCaseInsensitiveHeaderNamesWithDifferentValuesShouldKeepAll() {
-        val plainHeaders = listOf(
-            createPlainHeader("Content-Type", "application/json"),
-            createPlainHeader("content-type", "text/html"),
-            createPlainHeader("CONTENT-TYPE", "application/xml")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Content-Type", "application/json"),
+                createPlainHeader("content-type", "text/html"),
+                createPlainHeader("CONTENT-TYPE", "application/xml")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -127,11 +132,12 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenSameNameDifferentValuesShouldKeepAll() {
-        val plainHeaders = listOf(
-            createPlainHeader("Accept", "text/html"),
-            createPlainHeader("Accept", "application/json"),
-            createPlainHeader("Accept", "text/plain")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Accept", "text/html"),
+                createPlainHeader("Accept", "application/json"),
+                createPlainHeader("Accept", "text/plain")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -145,18 +151,19 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenComplexScenarioShouldHandleAllCasesCorrectly() {
-        val plainHeaders = listOf(
-            createPlainHeader("Content-Type", "application/json"),
-            createPlainHeader("Set-Cookie", "session=abc"),
-            createPlainHeader("Set-Cookie", "token=xyz"),
-            createPlainHeader("Set-Cookie", "session=abc"),
-            createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
-            createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
-            createPlainHeader("Cache-Control", "no-cache"),
-            createPlainHeader("cache-control", "no-cache"),
-            createPlainHeader("Accept", "text/html"),
-            createPlainHeader("Accept", "application/json")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Content-Type", "application/json"),
+                createPlainHeader("Set-Cookie", "session=abc"),
+                createPlainHeader("Set-Cookie", "token=xyz"),
+                createPlainHeader("Set-Cookie", "session=abc"),
+                createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
+                createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
+                createPlainHeader("Cache-Control", "no-cache"),
+                createPlainHeader("cache-control", "no-cache"),
+                createPlainHeader("Accept", "text/html"),
+                createPlainHeader("Accept", "application/json")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -180,10 +187,11 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenHeadersWithWhitespaceShouldPreserveExactValue() {
-        val plainHeaders = listOf(
-            createPlainHeader("X-Custom", "value with spaces"),
-            createPlainHeader("X-Custom", "value with spaces")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("X-Custom", "value with spaces"),
+                createPlainHeader("X-Custom", "value with spaces")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -193,10 +201,11 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenHeadersWithSpecialCharactersShouldPreserveExactValue() {
-        val plainHeaders = listOf(
-            createPlainHeader("Authorization", "Bearer eyJhbGc..."),
-            createPlainHeader("X-Special", "value=test;path=/;secure")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("Authorization", "Bearer eyJhbGc..."),
+                createPlainHeader("X-Special", "value=test;path=/;secure")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -207,10 +216,11 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenEmptyHeaderValueShouldHandleCorrectly() {
-        val plainHeaders = listOf(
-            createPlainHeader("X-Empty", ""),
-            createPlainHeader("X-Empty", "")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("X-Empty", ""),
+                createPlainHeader("X-Empty", "")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -220,12 +230,13 @@ class Retrofit2HelperTest {
 
     @Test
     fun testBuildHeadersWhenGivenMultipleHeadersWithSomeEmptyValuesShouldHandleCorrectly() {
-        val plainHeaders = listOf(
-            createPlainHeader("X-Test", "value1"),
-            createPlainHeader("X-Test", ""),
-            createPlainHeader("X-Test", "value2"),
-            createPlainHeader("X-Test", "")
-        )
+        val plainHeaders =
+            listOf(
+                createPlainHeader("X-Test", "value1"),
+                createPlainHeader("X-Test", ""),
+                createPlainHeader("X-Test", "value2"),
+                createPlainHeader("X-Test", "")
+            )
 
         val headers = buildHeaders(plainHeaders)
 
@@ -237,5 +248,8 @@ class Retrofit2HelperTest {
         assertTrue(values.contains("value2"))
     }
 
-    private fun createPlainHeader(name: String, value: String) = AidlNetworkRequest.PlainHeader(name, value)
+    private fun createPlainHeader(
+        name: String,
+        value: String
+    ) = AidlNetworkRequest.PlainHeader(name, value)
 }