feat(mobile-app): Reintroduce mobile-app feature gating (#2643)

This reverts commit 952feeb.

Fixes #2642

Author: szokeasaurusrex

.github/workflows/lint.yml

@@ -16,15 +16,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-14, windows-2022]
+        feature-args: ['', '-Funstable-mobile-app']
         include:
           - os: ubuntu-24.04
             display-os: Linux
           - os: macos-14
             display-os: macOS
           - os: windows-2022
             display-os: Windows
+          - feature-args: ''
+            feature-suffix: ''
+          - feature-args: '-Funstable-mobile-app'
+            feature-suffix: ' (-Funstable-mobile-app)'
 
-    name: ${{ matrix.display-os }}
+    name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repository
@@ -40,4 +45,4 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Run Clippy
-        run: cargo clippy --workspace --tests
+        run: cargo clippy --workspace --tests ${{ matrix.feature-args }}

.github/workflows/test.yml

@@ -16,15 +16,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-14, windows-2022]
+        feature-args: ['', '-Funstable-mobile-app']
         include:
           - os: ubuntu-24.04
             display-os: Linux
           - os: macos-14
             display-os: macOS
           - os: windows-2022
             display-os: Windows
+          - feature-args: ''
+            feature-suffix: ''
+          - feature-args: '-Funstable-mobile-app'
+            feature-suffix: ' (-Funstable-mobile-app)'
 
-    name: ${{ matrix.display-os }}
+    name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -35,4 +40,4 @@ jobs:
         uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
 
       - name: Run Cargo Tests
-        run: cargo test --workspace
+        run: cargo test --workspace ${{ matrix.feature-args }}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "rust-analyzer.cargo.features": ["unstable-mobile-app"],
+    "rust-analyzer.cargo.noDefaultFeatures": false
+}

Cargo.toml

@@ -11,6 +11,7 @@ rust-version = "1.86"
 [dependencies]
 anylog = "0.6.3"
 anyhow = { version = "1.0.69", features = ["backtrace"] }
+apple-catalog-parsing = { path = "apple-catalog-parsing", optional = true }
 backoff = "0.4.0"
 brotli2 = "0.3.2"
 bytecount = "0.6.3"
@@ -93,6 +94,10 @@ default = []
 managed = []
 with_crash_reporting = []
 
+# Feature flag for the mobile-app command, as it is still under development.
+# CI tests run against this flag, but we don't include it in release builds.
+unstable-mobile-app = ["apple-catalog-parsing"]
+
 [workspace.lints.clippy]
 allow-attributes = "warn"
 str-to-string = "warn"
@@ -111,7 +116,6 @@ workspace = true
 
 [target."cfg(target_os = \"macos\")".dependencies]
 mac-process-info = "0.2.0"
-apple-catalog-parsing = { path = "apple-catalog-parsing"}
 
 [target."cfg(unix)"]
 

src/api/data_types/chunking/mobile_app.rs

@@ -1,3 +1,4 @@
+#![cfg(feature = "unstable-mobile-app")]
 use serde::{Deserialize, Serialize};
 use sha1_smol::Digest;
 

src/api/data_types/chunking/mod.rs

@@ -14,5 +14,6 @@ pub use self::compression::ChunkCompression;
 pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest};
 pub use self::file_state::ChunkedFileState;
 pub use self::hash_algorithm::ChunkHashAlgorithm;
+#[cfg(feature = "unstable-mobile-app")]
 pub use self::mobile_app::{AssembleMobileAppResponse, ChunkedMobileAppRequest};
 pub use self::upload::{ChunkServerOptions, ChunkUploadCapability};

src/api/mod.rs

@@ -1017,6 +1017,7 @@ impl<'a> AuthenticatedApi<'a> {
             .convert_rnf(ApiErrorKind::ReleaseNotFound)
     }
 
+    #[cfg(feature = "unstable-mobile-app")]
     pub fn assemble_mobile_app(
         &self,
         org: &str,

src/commands/mobile_app/mod.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "unstable-mobile-app")]
+
 use anyhow::Result;
 use clap::{ArgMatches, Command};
 

src/commands/mod.rs

@@ -57,6 +57,7 @@ macro_rules! each_subcommand {
         $mac!(info);
         $mac!(issues);
         $mac!(login);
+        #[cfg(feature = "unstable-mobile-app")]
         $mac!(mobile_app);
         $mac!(monitors);
         $mac!(organizations);

src/utils/mobile_app/mod.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "unstable-mobile-app")]
+
 #[cfg(target_os = "macos")]
 mod apple;
 mod validation;