From d62b051229b5bb2c4722acc8067d91189b240638 Mon Sep 17 00:00:00 2001
From: Ben Dean-Kawamura <bdk@mozilla.com>
Date: Thu, 25 Jun 2026 10:36:43 -0400
Subject: [PATCH] Rename the viaduct Android package to `viaduct`.

Before it was named `httpconfig` for historical reasons, this one seems
more natural.
---
 .buildconfig-android.yml                                  | 8 ++++----
 CHANGELOG.md                                              | 1 +
 components/remote_settings/android/build.gradle           | 2 +-
 components/viaduct/android/build.gradle                   | 2 +-
 .../appservices/{httpconfig => viaduct}/FetchBackend.kt   | 7 +------
 .../appservices/{httpconfig => viaduct}/HttpConfig.kt     | 2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)
 rename components/viaduct/android/src/main/java/mozilla/appservices/{httpconfig => viaduct}/FetchBackend.kt (91%)
 rename components/viaduct/android/src/main/java/mozilla/appservices/{httpconfig => viaduct}/HttpConfig.kt (97%)

diff --git a/.buildconfig-android.yml b/.buildconfig-android.yml
index eec97ee42a..98aed1a062 100644
--- a/.buildconfig-android.yml
+++ b/.buildconfig-android.yml
@@ -63,13 +63,13 @@ projects:
     - name: rust-log-forwarder
       type: aar
     description: Forward logs from Rust
-  httpconfig:
+  viaduct:
     path: components/viaduct/android
-    artifactId: httpconfig
+    artifactId: viaduct
     publications:
-    - name: httpconfig
+    - name: viaduct
       type: aar
-    description: Component allowing the configuration of Rust HTTP stack.
+    description: Rust HTTP bridge.
   push:
     path: components/push/android
     artifactId: push
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8be15c65e0..91a7a5621b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - init_backend and `viaduct_init_backend_hyper` no longer throw an error if they're called multiple times.
   Instead, we report the error via the Rust components error ping.
   This is a breaking change for iOS, since the functions no longer throw.
+- Renamed the Android package to `mozilla.appservices.viaduct`
 
 ## 🔧 What's Fixed 🔧
 
diff --git a/components/remote_settings/android/build.gradle b/components/remote_settings/android/build.gradle
index 3a7dc8ff2f..b837884e0a 100644
--- a/components/remote_settings/android/build.gradle
+++ b/components/remote_settings/android/build.gradle
@@ -53,5 +53,5 @@ dependencies {
     } else {
         testImplementation libs.mozilla.concept.fetch
     }
-    testImplementation project(":httpconfig")
+    testImplementation project(":viaduct")
 }
diff --git a/components/viaduct/android/build.gradle b/components/viaduct/android/build.gradle
index c354c1ab27..ae2bb6edaa 100644
--- a/components/viaduct/android/build.gradle
+++ b/components/viaduct/android/build.gradle
@@ -2,7 +2,7 @@ apply from: "$appServicesRootDir/build-scripts/component-common.gradle"
 apply from: "$appServicesRootDir/publish.gradle"
 
 android {
-    namespace 'org.mozilla.appservices.httpconfig'
+    namespace 'org.mozilla.appservices.viaduct'
 }
 
 dependencies {
diff --git a/components/viaduct/android/src/main/java/mozilla/appservices/httpconfig/FetchBackend.kt b/components/viaduct/android/src/main/java/mozilla/appservices/viaduct/FetchBackend.kt
similarity index 91%
rename from components/viaduct/android/src/main/java/mozilla/appservices/httpconfig/FetchBackend.kt
rename to components/viaduct/android/src/main/java/mozilla/appservices/viaduct/FetchBackend.kt
index 3ea221eeff..2b41dc88ef 100644
--- a/components/viaduct/android/src/main/java/mozilla/appservices/httpconfig/FetchBackend.kt
+++ b/components/viaduct/android/src/main/java/mozilla/appservices/viaduct/FetchBackend.kt
@@ -2,13 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.appservices.httpconfig
+package mozilla.appservices.viaduct
 
-import mozilla.appservices.viaduct.Backend
-import mozilla.appservices.viaduct.ClientSettings
-import mozilla.appservices.viaduct.Method
-import mozilla.appservices.viaduct.Request
-import mozilla.appservices.viaduct.Response
 import java.util.concurrent.TimeUnit
 import mozilla.components.concept.fetch.Client as FetchClient
 import mozilla.components.concept.fetch.Header as FetchHeader
diff --git a/components/viaduct/android/src/main/java/mozilla/appservices/httpconfig/HttpConfig.kt b/components/viaduct/android/src/main/java/mozilla/appservices/viaduct/HttpConfig.kt
similarity index 97%
rename from components/viaduct/android/src/main/java/mozilla/appservices/httpconfig/HttpConfig.kt
rename to components/viaduct/android/src/main/java/mozilla/appservices/viaduct/HttpConfig.kt
index 20f5ebfef1..7e4f4ab4dc 100644
--- a/components/viaduct/android/src/main/java/mozilla/appservices/httpconfig/HttpConfig.kt
+++ b/components/viaduct/android/src/main/java/mozilla/appservices/viaduct/HttpConfig.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.appservices.httpconfig
+package mozilla.appservices.viaduct
 
 import mozilla.appservices.viaduct.initBackend
 import mozilla.components.concept.fetch.Client