Skip to content

dep(proguard): Update proguard cache format #1734

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
loewenheim merged 3 commits into from
Jul 17, 2025
Merged

dep(proguard): Update proguard cache format #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b43410
feat(proguard): Update proguard cache format
loewenheim Jul 17, 2025
0ef3d68
changelog
loewenheim Jul 17, 2025
29ee13d
Fix test
loewenheim Jul 17, 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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## Unreleased

### Dependencies

- Bump `proguard` from v5.5.0 to v5.6.1
This also bumps the proguard cache version from v3 to v4. ([#1734](https://github.com/getsentry/symbolicator/pull/1734))

## 25.7.0

### Various fixes & improvements
Expand Down
20 changes: 12 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ cpp_demangle = { git = "https://github.com/getsentry/cpp_demangle", branch = "se


[workspace.dependencies]
proguard = "5.6.1"
reqwest = "0.12.15"
serde-vars = "0.2.0"
symbolic = "12.15.5"
Expand Down
2 changes: 1 addition & 1 deletion crates/symbolicator-proguard/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT"

[dependencies]
futures = "0.3.12"
proguard = "5.5.0"
proguard = { workspace = true }
serde = { version = "1.0.137", features = ["derive", "rc"] }
serde_json = "1.0.81"
symbolic = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions ...guard/tests/integration/snapshots/integration__proguard__source_lookup_with_proguard.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,8 @@ stacktraces:
lineno: 7
index: 17
- function: onMenuItemClick
filename: EditActivity
filename: R8$$SyntheticClass
Copy link
Copy Markdown
Contributor Author

@loewenheim loewenheim Jul 17, 2025

Choose a reason for hiding this comment

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

This change is an effect of the improved file name resolution from getsentry/rust-proguard#55. The previous filename was incorrect.

module: io.sentry.samples.instrumentation.ui.EditActivity$$InternalSyntheticLambda$1$ebaa538726b99bb77e0f5e7c86443911af17d6e5be2b8771952ae0caa4ff2ac7$0
abs_path: EditActivity
lineno: 0
in_app: true
index: 18
Expand Down
1 change: 1 addition & 0 deletions crates/symbolicator-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ipnetwork = "0.20.0"
jsonwebtoken = "9.1.0"
moka = { version = "0.12.8", features = ["future", "sync"] }
once_cell = "1.17.1"
proguard = { workspace = true }
rand = "0.8.5"
rayon = "1.10.0"
reqwest = { workspace = true, features = [
Expand Down
9 changes: 7 additions & 2 deletions crates/symbolicator-service/src/caches/versions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,19 +265,24 @@ pub const BUNDLE_INDEX_CACHE_VERSIONS: CacheVersions = CacheVersions {

/// Proguard Cache, with the following versions:
///
/// - `4`: Information about classes/methods being synthesized is now part
/// of the cache format.
///
/// - `3`: Restructuring the cache directory format.
///
/// - `2`: Use proguard cache format (<https://github.com/getsentry/symbolicator/pull/1491>).
///
/// - `1`: Initial version.
pub const PROGUARD_CACHE_VERSIONS: CacheVersions = CacheVersions {
current: CacheVersion::new(3, CachePathFormat::V2),
fallbacks: &[CacheVersion::new(2, CachePathFormat::V1)],
current: CacheVersion::new(4, CachePathFormat::V2),
fallbacks: &[],
previous: &[
CacheVersion::new(1, CachePathFormat::V1),
CacheVersion::new(2, CachePathFormat::V1),
CacheVersion::new(3, CachePathFormat::V2),
],
};
static_assert!(proguard::PRGCACHE_VERSION == 2);

/// Symstore index cache, with the following versions:
///
Expand Down
Loading