From 286fed91ff98a1cd6cf1a39220e745183433713e Mon Sep 17 00:00:00 2001 From: Tarik Eshaq Date: Thu, 18 May 2023 16:58:14 -0400 Subject: [PATCH] Adds remote-settings to taskcluster iOS releases --- Cargo.lock | 1 + megazords/full/android/dependency-licenses.xml | 2 +- megazords/ios-rust/build-xcframework.sh | 3 ++- megazords/ios-rust/focus/Cargo.toml | 2 +- megazords/ios-rust/focus/MozillaRustComponents.h | 1 + megazords/ios-rust/focus/src/lib.rs | 1 + taskcluster/scripts/build-and-test-swift.py | 6 ++++-- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b3d153b2..ecf42c392 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2057,6 +2057,7 @@ dependencies = [ "error-support", "nimbus-sdk", "rc_log_ffi", + "remote_settings", "viaduct", "viaduct-reqwest", ] diff --git a/megazords/full/android/dependency-licenses.xml b/megazords/full/android/dependency-licenses.xml index ccc2c7ad8..60e430815 100644 --- a/megazords/full/android/dependency-licenses.xml +++ b/megazords/full/android/dependency-licenses.xml @@ -242,7 +242,7 @@ the details of which are reproduced below. Apache License 2.0: libc - https://github.com/rust-lang/libc/blob/master/LICENSE-APACHE + https://github.com/rust-lang/libc/blob/main/LICENSE-APACHE Apache License 2.0: linux-raw-sys diff --git a/megazords/ios-rust/build-xcframework.sh b/megazords/ios-rust/build-xcframework.sh index 63118fe84..ae4b901aa 100755 --- a/megazords/ios-rust/build-xcframework.sh +++ b/megazords/ios-rust/build-xcframework.sh @@ -145,10 +145,12 @@ mkdir -p "$COMMON/Headers" cp "$WORKING_DIR/$FRAMEWORK_NAME.h" "$COMMON/Headers" cp "$REPO_ROOT/components/rc_log/ios/RustLogFFI.h" "$COMMON/Headers" cp "$REPO_ROOT/components/viaduct/ios/RustViaductFFI.h" "$COMMON/Headers" +$CARGO uniffi-bindgen generate "$REPO_ROOT/components/remote_settings/src/remote_settings.udl" -l swift -o "$COMMON/Headers" $CARGO uniffi-bindgen generate "$REPO_ROOT/components/nimbus/src/nimbus.udl" -l swift -o "$COMMON/Headers" $CARGO uniffi-bindgen generate "$REPO_ROOT/components/support/error/src/errorsupport.udl" -l swift -o "$COMMON/Headers" + # We now only move/generate the rest of the headers if we are generating a full # iOS megazord if [ -z $IS_FOCUS ]; then @@ -164,7 +166,6 @@ if [ -z $IS_FOCUS ]; then $CARGO uniffi-bindgen generate "$REPO_ROOT/components/push/src/push.udl" -l swift -o "$COMMON/Headers" $CARGO uniffi-bindgen generate "$REPO_ROOT/components/tabs/src/tabs.udl" -l swift -o "$COMMON/Headers" $CARGO uniffi-bindgen generate "$REPO_ROOT/components/places/src/places.udl" -l swift -o "$COMMON/Headers" - $CARGO uniffi-bindgen generate "$REPO_ROOT/components/remote_settings/src/remote_settings.udl" -l swift -o "$COMMON/Headers" $CARGO uniffi-bindgen generate "$REPO_ROOT/components/sync_manager/src/syncmanager.udl" -l swift -o "$COMMON/Headers" $CARGO uniffi-bindgen generate "$REPO_ROOT/components/sync15/src/sync15.udl" -l swift -o "$COMMON/Headers" fi diff --git a/megazords/ios-rust/focus/Cargo.toml b/megazords/ios-rust/focus/Cargo.toml index 293e19765..3150388d2 100644 --- a/megazords/ios-rust/focus/Cargo.toml +++ b/megazords/ios-rust/focus/Cargo.toml @@ -14,4 +14,4 @@ viaduct = { path = "../../../components/viaduct" } viaduct-reqwest = { path = "../../../components/support/viaduct-reqwest" } nimbus-sdk = { path = "../../../components/nimbus" } error-support = { path = "../../../components/support/error" } - +remote_settings = { path = "../../../components/remote_settings" } diff --git a/megazords/ios-rust/focus/MozillaRustComponents.h b/megazords/ios-rust/focus/MozillaRustComponents.h index 7283edfb3..80c6507b8 100644 --- a/megazords/ios-rust/focus/MozillaRustComponents.h +++ b/megazords/ios-rust/focus/MozillaRustComponents.h @@ -9,3 +9,4 @@ #import "RustViaductFFI.h" #import "nimbusFFI.h" #import "errorFFI.h" +#import "remote_settingsFFI.h" diff --git a/megazords/ios-rust/focus/src/lib.rs b/megazords/ios-rust/focus/src/lib.rs index 91cbedbc9..a06d3f1f1 100644 --- a/megazords/ios-rust/focus/src/lib.rs +++ b/megazords/ios-rust/focus/src/lib.rs @@ -8,4 +8,5 @@ pub use error_support; pub use nimbus; pub use rc_log_ffi; +pub use remote_settings; pub use viaduct_reqwest; diff --git a/taskcluster/scripts/build-and-test-swift.py b/taskcluster/scripts/build-and-test-swift.py index 50d4607c0..cef8808ac 100755 --- a/taskcluster/scripts/build-and-test-swift.py +++ b/taskcluster/scripts/build-and-test-swift.py @@ -11,20 +11,22 @@ ROOT_DIR = pathlib.Path(__file__).parent.parent.parent # List of udl_paths to generate bindings for BINDINGS_UDL_PATHS = [ "components/autofill/src/autofill.udl", - "components/support/error/src/errorsupport.udl", "components/fxa-client/src/fxa_client.udl", "components/logins/src/logins.udl", "components/nimbus/src/nimbus.udl", "components/places/src/places.udl", "components/push/src/push.udl", + "components/remote_settings/src/remote_settings.udl", + "components/support/error/src/errorsupport.udl", + "components/sync15/src/sync15.udl", "components/sync_manager/src/syncmanager.udl", "components/tabs/src/tabs.udl", - "components/sync15/src/sync15.udl", ] # List of udl_paths to generate bindings for FOCUS_UDL_PATHS = [ "components/nimbus/src/nimbus.udl", + "components/remote_settings/src/remote_settings.udl", "components/support/error/src/errorsupport.udl", ]