Skip to content

Commit ae1dc9f

Browse files
committed
feat(proguard): Update proguard cache format
This updates the `proguard` dependency to 5.6.1 to get access to "synthesized" flags in the cache format (see getsentry/rust-proguard#52). Since the cache format has changed, this requires an _incompatible_ bump of the proguard cache version. It also adds a static version check for the cache version exposed by the `proguard` crate in analogy to symcaches and cficaches.
1 parent 30292c4 commit ae1dc9f

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

Cargo.lock

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ cpp_demangle = { git = "https://github.com/getsentry/cpp_demangle", branch = "se
5555

5656

5757
[workspace.dependencies]
58+
proguard = "5.6.1"
5859
reqwest = "0.12.15"
5960
serde-vars = "0.2.0"
6061
symbolic = "12.15.5"

crates/symbolicator-proguard/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT"
88

99
[dependencies]
1010
futures = "0.3.12"
11-
proguard = "5.5.0"
11+
proguard = { workspace = true }
1212
serde = { version = "1.0.137", features = ["derive", "rc"] }
1313
serde_json = "1.0.81"
1414
symbolic = { workspace = true }

crates/symbolicator-service/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ipnetwork = "0.20.0"
3030
jsonwebtoken = "9.1.0"
3131
moka = { version = "0.12.8", features = ["future", "sync"] }
3232
once_cell = "1.17.1"
33+
proguard = { workspace = true }
3334
rand = "0.8.5"
3435
rayon = "1.10.0"
3536
reqwest = { workspace = true, features = [

crates/symbolicator-service/src/caches/versions.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,19 +265,24 @@ pub const BUNDLE_INDEX_CACHE_VERSIONS: CacheVersions = CacheVersions {
265265

266266
/// Proguard Cache, with the following versions:
267267
///
268+
/// - `4`: Information about classes/methods being synthesized is now part
269+
/// of the cache format.
270+
///
268271
/// - `3`: Restructuring the cache directory format.
269272
///
270273
/// - `2`: Use proguard cache format (<https://github.com/getsentry/symbolicator/pull/1491>).
271274
///
272275
/// - `1`: Initial version.
273276
pub const PROGUARD_CACHE_VERSIONS: CacheVersions = CacheVersions {
274-
current: CacheVersion::new(3, CachePathFormat::V2),
275-
fallbacks: &[CacheVersion::new(2, CachePathFormat::V1)],
277+
current: CacheVersion::new(4, CachePathFormat::V2),
278+
fallbacks: &[],
276279
previous: &[
277280
CacheVersion::new(1, CachePathFormat::V1),
278281
CacheVersion::new(2, CachePathFormat::V1),
282+
CacheVersion::new(3, CachePathFormat::V2),
279283
],
280284
};
285+
static_assert!(proguard::PRGCACHE_VERSION == 2);
281286

282287
/// Symstore index cache, with the following versions:
283288
///

0 commit comments

Comments
 (0)