mozilla · mhammond · Nov 21, 2024 · Nov 19, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -39,7 +39,6 @@ the details of which are reproduced below.
 * [MIT License: want](#mit-license-want)
 * [MIT License: weedle2](#mit-license-weedle2)
 * [MIT License: winreg](#mit-license-winreg)
-* [MIT License: xshell-venv](#mit-license-xshell-venv)
 * [CC0-1.0 License: base16](#cc0-10-license-base16)
 * [ISC License: libloading](#isc-license-libloading)
 * [ISC License: ring](#isc-license-ring)
@@ -594,8 +593,6 @@ The following text applies to code linked from these dependencies:
 [windows-targets](https://github.com/microsoft/windows-rs),
 [windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
 [windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
-[xshell-macros](https://github.com/matklad/xshell),
-[xshell](https://github.com/matklad/xshell),
 [zerocopy](https://github.com/google/zerocopy)
 
 ```
@@ -1810,36 +1807,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-```
--------------
-## MIT License: xshell-venv
-
-The following text applies to code linked from these dependencies:
-[xshell-venv](https://github.com/badboy/xshell-venv)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2022 Jan-Erik Rediger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ```
 -------------
 ## CC0-1.0 License: base16

diff --git a/components/nimbus/Cargo.toml b/components/nimbus/Cargo.toml
@@ -44,7 +44,6 @@ firefox-versioning = { path = "../support/firefox-versioning", optional = true }
 
 [build-dependencies]
 uniffi = { workspace = true, features = ["build"] }
-glean-build = { path = "../external/glean/glean-core/build" }
 
 [dev-dependencies]
 viaduct-reqwest = { path = "../support/viaduct-reqwest" }

diff --git a/components/nimbus/build.rs b/components/nimbus/build.rs
@@ -2,19 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use glean_build::Builder;
-
 pub fn main() {
     #[cfg(feature = "stateful-uniffi-bindings")]
     uniffi::generate_scaffolding("./src/nimbus.udl").unwrap();
 
     #[cfg(not(feature = "stateful-uniffi-bindings"))]
     uniffi::generate_scaffolding("./src/cirrus.udl").unwrap();
-
-    Builder::default()
-        .file("./metrics.yaml")
-        .generate()
-        .unwrap();
-
-    println!("cargo:rerun-if-changed=./metrics.yaml");
 }
diff --git a/megazords/full/DEPENDENCIES.md b/megazords/full/DEPENDENCIES.md
@@ -24,7 +24,6 @@ the details of which are reproduced below.
 * [MIT License: smawk](#mit-license-smawk)
 * [MIT License: textwrap](#mit-license-textwrap)
 * [MIT License: weedle2](#mit-license-weedle2)
-* [MIT License: xshell-venv](#mit-license-xshell-venv)
 * [CC0-1.0 License: base16](#cc0-10-license-base16)
 * [ISC License: ring](#isc-license-ring)
 * [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
@@ -535,8 +534,6 @@ The following text applies to code linked from these dependencies:
 [windows-targets](https://github.com/microsoft/windows-rs),
 [windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
 [windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
-[xshell-macros](https://github.com/matklad/xshell),
-[xshell](https://github.com/matklad/xshell),
 [zerocopy](https://github.com/google/zerocopy)
 
 ```
@@ -1287,36 +1284,6 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABI
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-```
--------------
-## MIT License: xshell-venv
-
-The following text applies to code linked from these dependencies:
-[xshell-venv](https://github.com/badboy/xshell-venv)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2022 Jan-Erik Rediger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ```
 -------------
 ## CC0-1.0 License: base16

diff --git a/megazords/full/android/dependency-licenses.xml b/megazords/full/android/dependency-licenses.xml
@@ -484,14 +484,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: windows_x86_64_msvc</name>
     <url>https://github.com/microsoft/windows-rs/blob/master/license-mit</url>
   </license>
-  <license>
-    <name>Apache License 2.0: xshell</name>
-    <url>https://github.com/matklad/xshell/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: xshell-macros</name>
-    <url>https://github.com/matklad/xshell/blob/master/LICENSE-APACHE</url>
-  </license>
   <license>
     <name>Apache License 2.0: zerocopy</name>
     <url>https://github.com/google/zerocopy/blob/main/LICENSE-APACHE</url>
@@ -584,10 +576,6 @@ the details of which are reproduced below.
     <name>MIT License: weedle2</name>
     <url>https://github.com/mozilla/uniffi-rs/blob/main/weedle2/LICENSE.md</url>
   </license>
-  <license>
-    <name>MIT License: xshell-venv</name>
-    <url>https://github.com/badboy/xshell-venv/blob/main/LICENSE</url>
-  </license>
   <license>
     <name>CC0-1.0 License: base16</name>
     <url>https://github.com/thomcc/rust-base16/blob/master/LICENSE-APACHE</url>

diff --git a/megazords/ios-rust/DEPENDENCIES.md b/megazords/ios-rust/DEPENDENCIES.md
@@ -36,7 +36,6 @@ the details of which are reproduced below.
 * [MIT License: try-lock](#mit-license-try-lock)
 * [MIT License: want](#mit-license-want)
 * [MIT License: weedle2](#mit-license-weedle2)
-* [MIT License: xshell-venv](#mit-license-xshell-venv)
 * [CC0-1.0 License: base16](#cc0-10-license-base16)
 * [ISC License: libloading](#isc-license-libloading)
 * [ISC License: ring](#isc-license-ring)
@@ -573,8 +572,6 @@ The following text applies to code linked from these dependencies:
 [uuid](https://github.com/uuid-rs/uuid),
 [vcpkg](https://github.com/mcgoo/vcpkg-rs),
 [version_check](https://github.com/SergioBenitez/version_check),
-[xshell-macros](https://github.com/matklad/xshell),
-[xshell](https://github.com/matklad/xshell),
 [zerocopy](https://github.com/google/zerocopy)
 
 ```
@@ -1711,36 +1708,6 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABI
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-```
--------------
-## MIT License: xshell-venv
-
-The following text applies to code linked from these dependencies:
-[xshell-venv](https://github.com/badboy/xshell-venv)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2022 Jan-Erik Rediger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ```
 -------------
 ## CC0-1.0 License: base16