From b6283c9af1a9a7dce0cfc86ebc077a043aa63a35 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 23 Sep 2026 14:53:21 -0400
Subject: [PATCH 1/3] Remove obsolete JNA version constraint

---
 app/build.gradle          | 10 ----------
 gradle/libs.versions.toml |  6 ------
 2 files changed, 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f1ceab2d8d..e8472a86a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,16 +179,6 @@ project.configurations.configureEach {
 }
 
 dependencies {
-
-    // We pick up JNA transitively by way of Glean, which is currently on version 5.14.0.
-    // However, we need to force version 5.17.0 due to Google Play's 16KB page size requirement.
-    // JNA 5.15.0+ crashes on Android <7, however, so it can't be bumped in Glean at this time.
-    // Therefore, manually force the use of version 5.17.0 at the app level since we only support
-    // running on Android 8+ now anyway.
-    constraints {
-        implementation(libs.jna)
-    }
-
     implementation libs.androidx.activity
     implementation libs.androidx.annotation
     implementation libs.androidx.appcompat
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 671535bfc6..d4f48ef22f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,9 +12,6 @@ kotlinx-coroutines = "1.11.0"
 # Google
 material = "1.14.0"
 
-# JNA
-jna = "5.18.1"
-
 # AndroidX
 androidx-activity = "1.13.0"
 androidx-annotation = "1.10.0"
@@ -62,9 +59,6 @@ kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor
 # Google
 google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
-# JNA
-jna = { group = "net.java.dev.jna", name = "jna", version.ref = "jna" }
-
 # AndroidX
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidx-activity" }
 androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" }

From cc297dfea0cf39bc55837abbfaf38c7bf9faf994 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 23 Sep 2026 14:54:04 -0400
Subject: [PATCH 2/3] Update Spotless to version 8.10.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d4f48ef22f..8520ce2750 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ dependency-analysis = "3.19.2"
 detekt = "1.23.8"
 jspecify = "1.0.0"
 ktfmt = "0.64"
-spotless = "8.10.0"
+spotless = "8.10.2"
 
 # Third Party Testing
 hamcrest = "1.3"

From 7f25b94de9f43044125f7a340e537cb7c84ae0dd Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Wed, 23 Sep 2026 14:54:36 -0400
Subject: [PATCH 3/3] Update Okio to version 3.18.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8520ce2750..af0f7eac6f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ hamcrest = "1.3"
 jacoco = "0.8.15"
 junit = "4.13.2"
 okhttp = "5.5.0"
-okio = "3.18.1"
+okio = "3.18.2"
 
 [libraries]
 # Kotlin