diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5631df08df..5caf330ab4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,6 @@ 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 @@ -24,12 +23,8 @@ jobs: 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 }}${{ matrix.feature-suffix }} + name: ${{ matrix.display-os }} runs-on: ${{ matrix.os }} steps: - name: Checkout Repository @@ -45,4 +40,4 @@ jobs: run: cargo fmt --all -- --check - name: Run Clippy - run: cargo clippy --workspace --tests ${{ matrix.feature-args }} + run: cargo clippy --workspace --tests diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 414184a797..4606220dcd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,6 @@ 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 @@ -24,12 +23,8 @@ jobs: 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 }}${{ matrix.feature-suffix }} + name: ${{ matrix.display-os }} runs-on: ${{ matrix.os }} steps: @@ -40,4 +35,4 @@ jobs: uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0 - name: Run Cargo Tests - run: cargo test --all ${{ matrix.feature-args }} + run: cargo test --all diff --git a/.vscode/settings.json b/.vscode/settings.json index 045a559f42..e69de29bb2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +0,0 @@ -{ - "rust-analyzer.cargo.features": ["unstable-mobile-app"], - "rust-analyzer.cargo.noDefaultFeatures": false -} diff --git a/Cargo.toml b/Cargo.toml index 9a449cab5a..fb15fa1663 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,6 @@ 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" @@ -94,10 +93,6 @@ 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" @@ -115,6 +110,7 @@ workspace = true [target."cfg(target_os = \"macos\")".dependencies] mac-process-info = "0.2.0" +apple-catalog-parsing = { path = "apple-catalog-parsing"} [target."cfg(unix)"] diff --git a/src/api/data_types/chunking/mobile_app.rs b/src/api/data_types/chunking/mobile_app.rs index b29f3a18b1..b64f56ab80 100644 --- a/src/api/data_types/chunking/mobile_app.rs +++ b/src/api/data_types/chunking/mobile_app.rs @@ -1,4 +1,3 @@ -#![cfg(feature = "unstable-mobile-app")] use serde::{Deserialize, Serialize}; use sha1_smol::Digest; diff --git a/src/api/data_types/chunking/mod.rs b/src/api/data_types/chunking/mod.rs index 448ed2b09b..c1c2267625 100644 --- a/src/api/data_types/chunking/mod.rs +++ b/src/api/data_types/chunking/mod.rs @@ -14,6 +14,5 @@ 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}; diff --git a/src/api/mod.rs b/src/api/mod.rs index d4404c31a7..ab5882e877 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -1018,7 +1018,6 @@ impl<'a> AuthenticatedApi<'a> { .convert_rnf(ApiErrorKind::ReleaseNotFound) } - #[cfg(feature = "unstable-mobile-app")] pub fn assemble_mobile_app( &self, org: &str, diff --git a/src/commands/mobile_app/mod.rs b/src/commands/mobile_app/mod.rs index cc0efac261..9cae9207a6 100644 --- a/src/commands/mobile_app/mod.rs +++ b/src/commands/mobile_app/mod.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "unstable-mobile-app")] - use anyhow::Result; use clap::{ArgMatches, Command}; diff --git a/src/commands/mod.rs b/src/commands/mod.rs index ecb7f95691..2ae9cbb39b 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -57,7 +57,6 @@ macro_rules! each_subcommand { $mac!(info); $mac!(issues); $mac!(login); - #[cfg(feature = "unstable-mobile-app")] $mac!(mobile_app); $mac!(monitors); $mac!(organizations); diff --git a/src/utils/mobile_app/mod.rs b/src/utils/mobile_app/mod.rs index 4d07590a34..5e80986449 100644 --- a/src/utils/mobile_app/mod.rs +++ b/src/utils/mobile_app/mod.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "unstable-mobile-app")] - #[cfg(target_os = "macos")] mod apple; mod validation; diff --git a/tests/integration/mobile_app/mod.rs b/tests/integration/mobile_app/mod.rs index cec6153810..fff27de69c 100644 --- a/tests/integration/mobile_app/mod.rs +++ b/tests/integration/mobile_app/mod.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "unstable-mobile-app")] - use crate::integration::TestManager; mod upload;