Skip to content

Commit 952feeb

Browse files
feat(mobile-app): Remove unstable-mobile-app feature gating (#2601)
We're ready to start end-to-end testing this, so removing the `unstable-mobile-app` flag that was added in #2582 to re-enable the `mobile-app` command without the explicit flag. --------- Co-authored-by: Daniel Szoke <daniel.szoke@sentry.io>
1 parent fcc6506 commit 952feeb

File tree

11 files changed

+5
-33
lines changed

11 files changed

+5
-33
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,15 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-24.04, macos-14, windows-2022]
19-
feature-args: ['', '-Funstable-mobile-app']
2019
include:
2120
- os: ubuntu-24.04
2221
display-os: Linux
2322
- os: macos-14
2423
display-os: macOS
2524
- os: windows-2022
2625
display-os: Windows
27-
- feature-args: ''
28-
feature-suffix: ''
29-
- feature-args: '-Funstable-mobile-app'
30-
feature-suffix: ' (-Funstable-mobile-app)'
3126

32-
name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
27+
name: ${{ matrix.display-os }}
3328
runs-on: ${{ matrix.os }}
3429
steps:
3530
- name: Checkout Repository
@@ -45,4 +40,4 @@ jobs:
4540
run: cargo fmt --all -- --check
4641

4742
- name: Run Clippy
48-
run: cargo clippy --workspace --tests ${{ matrix.feature-args }}
43+
run: cargo clippy --workspace --tests

.github/workflows/test.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,15 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-24.04, macos-14, windows-2022]
19-
feature-args: ['', '-Funstable-mobile-app']
2019
include:
2120
- os: ubuntu-24.04
2221
display-os: Linux
2322
- os: macos-14
2423
display-os: macOS
2524
- os: windows-2022
2625
display-os: Windows
27-
- feature-args: ''
28-
feature-suffix: ''
29-
- feature-args: '-Funstable-mobile-app'
30-
feature-suffix: ' (-Funstable-mobile-app)'
3126

32-
name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
27+
name: ${{ matrix.display-os }}
3328
runs-on: ${{ matrix.os }}
3429

3530
steps:
@@ -40,4 +35,4 @@ jobs:
4035
uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
4136

4237
- name: Run Cargo Tests
43-
run: cargo test --all ${{ matrix.feature-args }}
38+
run: cargo test --all

.vscode/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
{
2-
"rust-analyzer.cargo.features": ["unstable-mobile-app"],
3-
"rust-analyzer.cargo.noDefaultFeatures": false
4-
}

Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ rust-version = "1.86"
1111
[dependencies]
1212
anylog = "0.6.3"
1313
anyhow = { version = "1.0.69", features = ["backtrace"] }
14-
apple-catalog-parsing = { path = "apple-catalog-parsing", optional = true }
1514
backoff = "0.4.0"
1615
brotli2 = "0.3.2"
1716
bytecount = "0.6.3"
@@ -94,10 +93,6 @@ default = []
9493
managed = []
9594
with_crash_reporting = []
9695

97-
# Feature flag for the mobile-app command, as it is still under development.
98-
# CI tests run against this flag, but we don't include it in release builds.
99-
unstable-mobile-app = ["apple-catalog-parsing"]
100-
10196
[workspace.lints.clippy]
10297
allow-attributes = "warn"
10398
str-to-string = "warn"
@@ -115,6 +110,7 @@ workspace = true
115110

116111
[target."cfg(target_os = \"macos\")".dependencies]
117112
mac-process-info = "0.2.0"
113+
apple-catalog-parsing = { path = "apple-catalog-parsing"}
118114

119115
[target."cfg(unix)"]
120116

src/api/data_types/chunking/mobile_app.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![cfg(feature = "unstable-mobile-app")]
21
use serde::{Deserialize, Serialize};
32
use sha1_smol::Digest;
43

src/api/data_types/chunking/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ pub use self::compression::ChunkCompression;
1414
pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest};
1515
pub use self::file_state::ChunkedFileState;
1616
pub use self::hash_algorithm::ChunkHashAlgorithm;
17-
#[cfg(feature = "unstable-mobile-app")]
1817
pub use self::mobile_app::{AssembleMobileAppResponse, ChunkedMobileAppRequest};
1918
pub use self::upload::{ChunkServerOptions, ChunkUploadCapability};

src/api/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,6 @@ impl<'a> AuthenticatedApi<'a> {
10181018
.convert_rnf(ApiErrorKind::ReleaseNotFound)
10191019
}
10201020

1021-
#[cfg(feature = "unstable-mobile-app")]
10221021
pub fn assemble_mobile_app(
10231022
&self,
10241023
org: &str,

src/commands/mobile_app/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "unstable-mobile-app")]
2-
31
use anyhow::Result;
42
use clap::{ArgMatches, Command};
53

src/commands/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ macro_rules! each_subcommand {
5757
$mac!(info);
5858
$mac!(issues);
5959
$mac!(login);
60-
#[cfg(feature = "unstable-mobile-app")]
6160
$mac!(mobile_app);
6261
$mac!(monitors);
6362
$mac!(organizations);

src/utils/mobile_app/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "unstable-mobile-app")]
2-
31
#[cfg(target_os = "macos")]
42
mod apple;
53
mod validation;

0 commit comments

Comments
 (0)