monorepo tweaks (#7107)

mhammond · web-flow · commit b343bf76cd69 · 2025-12-29T07:46:37.000Z
diff --git a/automation/tests.py b/automation/tests.py
@@ -445,8 +445,7 @@ def calc_steps(args):
     if args.mode == "changes":
         # changes mode is complicated enough that it's split off into its own
         # function
-        for step in calc_steps_change_mode(args):
-            yield step
+        yield from calc_steps_change_mode(args)
     elif args.mode == "rust-tests":
         print_rust_environment()
         yield Step("cargo clean", cargo_clean)
diff --git a/build-scripts/component-common.gradle b/build-scripts/component-common.gradle
@@ -117,17 +117,17 @@ ext.configureUniFFIBindgen = { crateName ->
         // in moz-central we can use an `Exec` task because we can assume the bindgen tool has already been built.
         generateUniffiBindings = tasks.register("generateUniffiBindings", Exec) {
             def libraryPath = "${gradle.mozconfig.topobjdir}/dist/bin/libmegazord.so"
-            def megazordNative = "${gradle.mozconfig.topobjdir}/dist/host/bin/embedded-uniffi-bindgen"
+            def bindgen = gradle.ext.mozconfig.substs.EMBEDDED_UNIFFI_BINDGEN
 
             workingDir project.rootDir
-            commandLine "${gradle.mozconfig.topobjdir}/dist/host/bin/embedded-uniffi-bindgen"
+            commandLine bindgen
             args 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format'
 
             outputs.dir uniffiOutDir
             // Re-generate when the native megazord library is rebuilt
-            inputs.files megazordNative
+            inputs.files libraryPath
             // Re-generate if our uniffi-bindgen tooling changes.
-            inputs.dir "${project.appServicesRootDir}/tools/embedded-uniffi-bindgen/"
+            inputs.files bindgen
         }
     } else {
         // In app-services we can't use `Exec` because the megazord target isn't built yet, which we force via `doFirst`
diff --git a/components/ads-client/metrics.yaml b/components/ads-client/metrics.yaml
@@ -124,4 +124,4 @@ ads_client:
       - ahanot@mozilla.com
       - llisi@mozilla.com
       - toast@mozilla.com
-    expires: never
+    expires: never
diff --git a/components/ads-client/src/http_cache/clock.rs b/components/ads-client/src/http_cache/clock.rs
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
 pub trait Clock: Send + Sync + 'static {
     fn now_epoch_seconds(&self) -> i64;
     #[cfg(test)]
diff --git a/components/merino/uniffi.toml b/components/merino/uniffi.toml
@@ -4,4 +4,4 @@ package_name = "mozilla.appservices.merino"
 [bindings.swift]
 ffi_module_name = "MozillaRustComponents"
 ffi_module_filename = "merinoFFI"
-generate_codable_conformance = true
+generate_codable_conformance = true
diff --git a/components/support/nimbus-fml/moz.build b/components/support/nimbus-fml/moz.build
diff --git a/components/viaduct/src/ohttp_client.rs b/components/viaduct/src/ohttp_client.rs
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
 use crate::ViaductError;
 use parking_lot::Mutex;
 use std::collections::HashMap;
diff --git a/examples/nimbus/Cargo.toml b/examples/nimbus/Cargo.toml
@@ -10,4 +10,3 @@ error-support = { path = "../../components/support/error", features = ["testing"
 viaduct-hyper = { path = "../../components/support/viaduct-hyper" }
 clap = { version = "4.2", default-features = false, features = ["std", "derive"] }
 remote_settings = { path = "../../components/remote_settings" }
-
diff --git a/settings.gradle b/settings.gradle
@@ -61,8 +61,13 @@ def setupProject(name, projectProps, appServicesRootDir) {
 
     def projectDir = new File(appServicesRootDir, path)
     // tooling-nimbus-gradle gets special treatment, it doesn't exist in the monorepo
-    if (!projectDir.exists() && name != "tooling-nimbus-gradle") {
-        throw new GradleException("Project directory does not exist: $projectDir (for project $name)")
+    // (and should be removed entirely!)
+    if (!projectDir.exists()) {
+        if (name != "tooling-nimbus-gradle") {
+            throw new GradleException("Project directory does not exist: $projectDir (for project $name)")
+        }
+        // gradle 9 gets upset if the dir doesn't exist, even if it's not actually used, like this isn't.
+        projectDir = appServicesRootDir
     }
     project(":$name").projectDir = projectDir
 
diff --git a/tools/embedded-uniffi-bindgen/Cargo.toml b/tools/embedded-uniffi-bindgen/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["The Firefox Sync Developers <sync-team@mozilla.com>"]
 edition = "2021"
 license = "MPL-2.0"
 
-# A bin target needed when used in m-c.
 [[bin]]
 name = "embedded-uniffi-bindgen"
 
diff --git a/tools/embedded-uniffi-bindgen/moz.build b/tools/embedded-uniffi-bindgen/moz.build
diff --git a/tools/embedded-uniffi-bindgen/src/config_supplier.rs b/tools/embedded-uniffi-bindgen/src/config_supplier.rs
@@ -73,7 +73,7 @@ fn find_workspace_crates() -> Result<HashMap<String, Utf8PathBuf>> {
         }
 
         let toml = CargoToml::from_path(&toml_path)?;
-        let new_paths = find_other_cargo_toml_paths(&crate_dir, &toml)?;
+        let new_paths = find_other_cargo_toml_paths(&crate_dir, &toml);
         toml_paths_to_process.extend(new_paths);
 
         // Add both the package name and library name to the map
@@ -113,12 +113,15 @@ fn find_workspace_toml() -> Result<CargoTomlFile> {
 }
 
 /// Process Cargo.toml data and return all crate paths referenced in it
-fn find_other_cargo_toml_paths(crate_dir: &Utf8Path, toml: &CargoToml) -> Result<Vec<Utf8PathBuf>> {
+fn find_other_cargo_toml_paths(crate_dir: &Utf8Path, toml: &CargoToml) -> Vec<Utf8PathBuf> {
     toml.dependencies
         .iter()
         .flat_map(|d| d.values())
         .filter_map(|dep| match dep {
-            CargoDependency::Detailed { path: Some(path) } => Some(join(crate_dir, path)),
+            // for servo in particular, Cargo.toml specifies relative paths which do not exist, presumably gated by features.
+            // eg, `servo/components/style_traits/Cargo.toml` references `../atoms`.
+            // So these are just ignored rather than treated as an error.
+            CargoDependency::Detailed { path: Some(path) } => join(crate_dir, path).ok(),
             _ => None,
         })
         .collect()
diff --git a/tools/embedded-uniffi-bindgen/src/lib.rs b/tools/embedded-uniffi-bindgen/src/lib.rs
@@ -0,0 +1,10 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+pub mod config_supplier;
+mod uniffi_bindgen;
+
+pub fn main() -> anyhow::Result<()> {
+    uniffi_bindgen::run_main()
+}
diff --git a/tools/import-app-services-to-central.sh b/tools/import-app-services-to-central.sh
@@ -27,10 +27,11 @@ export MOZ_AVOID_JJ_VCS=1
 moz-phab patch --apply-to=here --skip-dependencies --no-branch D260481
 # Bug 1981871 - Make `./mach rusttests` run some tests via cargo directly,
 moz-phab patch --apply-to=here --skip-dependencies --no-branch D260480
-# gradle
-moz-phab patch --apply-to=here --skip-dependencies --no-branch D245762
 # enable `--with-appservices-in-tree` config option by default
 moz-phab patch --apply-to=here --skip-dependencies --no-branch D263599
+# unstub toolchains
+moz-phab patch --apply-to=here --skip-dependencies --no-branch D274371
+
 # vet nimbus, rc_crypto, ece, etc
 moz-phab patch --apply-to=here --skip-dependencies --no-branch D258722
 # lint
@@ -52,7 +53,6 @@ rm -rf gradle
 rm proguard-rules-consumer-jna.pro
 rm install-nimbus-cli.sh
 rm rust-toolchain.toml
-rm -rf components/external
 rm -rf docs/shared
 # need a story for these generated deps - bug 1963617
 rm DEPENDENCIES.md megazords/full/android/dependency-licenses.xml megazords/full/DEPENDENCIES.md megazords/ios-rust/DEPENDENCIES.md megazords/ios-rust/focus/DEPENDENCIES.md
@@ -215,7 +215,7 @@ cargo update -p gkrust-shared
 cargo update -p expect-test --precise 1.4.1
 cargo update -p fragile --precise 2.0.0
 cargo update -p mockito --precise 0.31.0
-cargo update -p predicates --precise 3.0.4
+cargo update -p predicates --precise 3.1.3
 cargo update -p predicates-core --precise 1.0.6
 cargo update -p predicates-tree --precise 1.0.9
 
@@ -227,8 +227,8 @@ sed -e 's|/dom/webgpu/tests/cts/vendor/target/|/dom/webgpu/tests/cts/vendor/targ
 mv .gitignore.tmp .gitignore
 # .hgignore needs the same, but with a leading `^` instead of `/`
 sed -e 's|\^dom/webgpu/tests/cts/vendor/target/|^dom/webgpu/tests/cts/vendor/target/\
-^services/app-services/**/target/\
-^services/app-services/**/Cargo.lock|' \
+^services/app-services/.*/target/\
+^services/app-services/.*/Cargo.lock|' \
   .hgignore > .hgignore.tmp
 mv .hgignore.tmp .hgignore
 
diff --git a/tools/loc_summary.py b/tools/loc_summary.py
@@ -94,9 +94,9 @@ def get_loc_summary(path):
 def print_loc_summaries(paths):
     summaries = [get_loc_summary(path) for path in paths]
     headers = ["Path", "Shared", "Android", "iOS", "Total", "Shared %"]
-    nameWidth = max(
+    nameWidth = max(  # noqa: PLW3301
         len(headers[0]), max(len(summary["path"]) for summary in summaries)
-    )  # noqa: PLW3301
+    )
     numWidth = max(  # noqa: PLW3301
         max(len(h) for h in headers[1:]),
         max(len(str(summary["all"])) for summary in summaries),

-Original file line number
+Diff line change
       - [email protected]
       - [email protected]
       - [email protected]
 -    expires: never
 +    expires: never