Skip to content

feat(mobile-app): Remove unstable-mobile-app feature gating #2601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szokeasaurusrex merged 7 commits into from
Jul 22, 2025
Merged

feat(mobile-app): Remove unstable-mobile-app feature gating #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
caba10a
Remove unstable-mobile-app feature gating
rbro112 Jul 15, 2025
4a7edc4
Fix
rbro112 Jul 15, 2025
74f2782
Rebase
rbro112 Jul 21, 2025
9ecb724
Rebase
rbro112 Jul 21, 2025
790bb48
Re-add feature-args for later potential use
rbro112 Jul 21, 2025
c983c53
minor changes
szokeasaurusrex Jul 22, 2025
a70336a
Merge remote-tracking branch 'origin/master' into ryan/remove_unstabl…
szokeasaurusrex Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,15 @@ 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 }}${{ matrix.feature-suffix }}
name: ${{ matrix.display-os }}
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
Expand All @@ -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
9 changes: 2 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,15 @@ 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 }}${{ matrix.feature-suffix }}
name: ${{ matrix.display-os }}
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -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
4 changes: 0 additions & 4 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
{
"rust-analyzer.cargo.features": ["unstable-mobile-app"],
"rust-analyzer.cargo.noDefaultFeatures": false
}
6 changes: 1 addition & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Copy link
Member Author

@rbro112 rbro112 Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@szokeasaurusrex, I had to remove the optional flag to get this to compile properly. Admittedly I'm a bit unsure of the effect that removing this optionality would have as it pertains to the release (and how you had the dependency seemingly conditionally included with the unstable-mobile-app feature), so if you don't mind a check/fix here, that would be great.

Copy link
Member

@szokeasaurusrex szokeasaurusrex Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine. The crate should compile on all platforms; on non-macOS platforms it is just an empty crate.

I can try to see though if I can add it as a macOS-specific dependency

backoff = "0.4.0"
brotli2 = "0.3.2"
bytecount = "0.6.3"
Expand Down Expand Up @@ -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"
Expand All @@ -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)"]

Expand Down
1 change: 0 additions & 1 deletion src/api/data_types/chunking/mobile_app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]
use serde::{Deserialize, Serialize};
use sha1_smol::Digest;

Expand Down
1 change: 0 additions & 1 deletion src/api/data_types/chunking/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
1 change: 0 additions & 1 deletion src/api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions src/commands/mobile_app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]

use anyhow::Result;
use clap::{ArgMatches, Command};

Expand Down
1 change: 0 additions & 1 deletion src/commands/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions src/utils/mobile_app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]

#[cfg(target_os = "macos")]
mod apple;
mod validation;
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/mobile_app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]

use crate::integration::TestManager;

mod upload;
Expand Down