Merge branch 'main' into pocket-suggestions

mozilla · Oct 4, 2023 · 05b2c61 · 05b2c61
2 parents 2e27f25 + 399fe73
commit 05b2c61
Show file tree

Hide file tree

Showing 27 changed files with 343 additions and 264 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -212,8 +212,6 @@ jobs:
     executor: macos
     steps:
       - full-checkout
-      # swiftlint moved? See https://github.com/Homebrew/discussions/discussions/691
-      - run: brew update-reset
       - run: brew install swiftlint swiftformat
       - run: ./automation/tests.py swiftlint
       - run: ./automation/tests.py swiftformat

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 [Full Changelog](In progress)
 
-v119.0 (_2023-09-25_)
+## Rust log forwarder
+
+### 🦊 What's Changed 🦊
+- Exposed rust-log-forwarder for iOS ([#5840](https://github.com/mozilla/application-services/pull/5840)).
+
+# v119.0 (_2023-09-25_)
 
 ## Nimbus SDK ⛅️🔬🔭
 
@@ -19,10 +24,14 @@ v119.0 (_2023-09-25_)
   - This adds methods to parse a feature configuration and return errors.
 - Added a `FmlFeatureDescriptor` to the `FmlClient` ([#5815](https://github.com/mozilla/application-services/pull/5815)).
   - This adds methods to get the feature_ids and descriptions from a loaded manifest.
+- Added a `channels` subcommmand to the command line ([#5844](https://github.com/mozilla/application-services/pull/5844)).
+  - This prints the channels for the given manifest.
 
-### ✨ What's New ✨
+### 🦊 What's Changed 🦊
+
+- Removed the `channel` argument from the `generate-experimenter` command ([#5843](https://github.com/mozilla/application-services/pull/5843)).
+  - This cleans up some design issues/technical debt deep within the internal representation of the FML compiler.
 
-- The `set_experiments` method has been updated to filter down the list of experiments to only those that match the configured `app_name` and `channel` ([#5813](https://github.com/mozilla/application-services/pull/5813)).
 ## Places
 
 ### 🦊 What's Changed 🦊

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,6 @@
 [workspace]
+resolver = "2"
+
 # Note: Any additions here should be repeated in default-members below.
 members = [
     "components/as-ohttp-client",

diff --git a/build.gradle b/build.gradle
@@ -328,6 +328,8 @@ tasks.register("ktlintFormat", JavaExec) {
     classpath = configurations.ktlint
     main = "com.pinterest.ktlint.Main"
     args "-F", "${projectDir}/components/**/*.kt", "${projectDir}/gradle-plugin/**/*.kt", "buildSrc/**/*.kt", "!**/build", "!**/templates/**", "!components/external", "!**/generated/**"
+    // Fix for newer Java from https://github.com/pinterest/ktlint/issues/1195#issuecomment-1009027802
+    jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
 // Extremely unsophisticated way to publish a local development version while hiding implementation details.

diff --git a/components/as-ohttp-client/Cargo.toml b/components/as-ohttp-client/Cargo.toml
@@ -20,7 +20,7 @@ rusqlite = { version = "0.29.0", features = ["bundled"] }
 version = "0.4"
 default-features = false
 git = "https://github.com/martinthomson/ohttp.git"
-revision = "fc3f4c787d1f6a6a87bf5194f7152cc906b02973"
+rev = "fc3f4c787d1f6a6a87bf5194f7152cc906b02973"
 features = ["client", "server", "app-svc", "external-sqlite"]
 
 [build-dependencies]

diff --git a/components/support/nimbus-cli/src/sources/manifest.rs b/components/support/nimbus-cli/src/sources/manifest.rs
@@ -90,7 +90,7 @@ impl TryFrom<&ManifestSource> for FeatureManifest {
         let files = value.manifest_loader()?;
         let path = files.file_path(value.manifest_file())?;
         let parser: Parser = Parser::new(files, path)?;
-        let manifest = parser.get_intermediate_representation(value.channel())?;
+        let manifest = parser.get_intermediate_representation(Some(value.channel()))?;
         manifest.validate_manifest()?;
         Ok(manifest)
     }

diff --git a/components/support/nimbus-fml/Cargo.toml b/components/support/nimbus-fml/Cargo.toml
@@ -20,7 +20,7 @@ serde_json = "1"
 serde_yaml = "0.8.21"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0.29"
-askama = "0.10.5"
+askama = "0.12"
 textwrap = "0.14.2"
 heck = "0.3.3"
 unicode-segmentation = "1.8.0"

diff --git a/components/support/nimbus-fml/src/backends/frontend_manifest.rs b/components/support/nimbus-fml/src/backends/frontend_manifest.rs
@@ -18,11 +18,12 @@ impl From<FeatureManifest> for ManifestFrontEnd {
         let enums = merge(&value, |fm| fm.iter_enum_defs().collect(), |e| &e.name);
 
         let about = value.about.description_only();
+        let channels = value.channel.into_iter().collect();
 
         ManifestFrontEnd {
             about: Some(about),
             version: "1.0.0".to_string(),
-            channels: vec![value.channel],
+            channels,
             includes: Default::default(),
             imports: Default::default(),
             features,