From 29d3e8397fbf8e959063b05dc33a006408684696 Mon Sep 17 00:00:00 2001 From: denis0001-dev Date: Thu, 19 Nov 2026 20:14:59 +0300 Subject: [PATCH] Exclude duplicate sqlite-jdbc from SQLDelight for desktop ProGuard. Incognito SQLCipher needs sqlite-jdbc-crypt; pulling xerial via the SQLDelight driver duplicated org.sqlite on the release classpath and failed CI ProGuard. Co-authored-by: Cursor --- .agents/skills/release/SKILL.md | 4 +++- app/shared/build.gradle.kts | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.agents/skills/release/SKILL.md b/.agents/skills/release/SKILL.md index c950724..d4fc449 100644 --- a/.agents/skills/release/SKILL.md +++ b/.agents/skills/release/SKILL.md @@ -54,7 +54,9 @@ All three tasks must succeed. A failed compile wastes ~17+ minutes of CI. - `@Serializable` data classes that reference a type **without** `@Serializable` (e.g. a plain `interface Auth`) — ProGuard drops the interface and aborts with “unresolved references” / “Please correct the above warnings first”. - **Fix:** mark the hierarchy root `@Serializable` (e.g. `sealed interface Auth`) and/or add `-keep` rules in [`app/desktop/proguard-rules.pro`](../../app/desktop/proguard-rules.pro). Log path on failure: `app/desktop/build/compose/logs/proguardReleaseJars/`. -**macOS local vs CI:** `exportReleaseProguardForCi` on a Mac with JetBrains Runtime (JBR/JCEF) may still fail with dozens of `com.sun.javafx` / `com.sun.glass` “descriptor class” warnings that **do not** appear on `ubuntu-latest` CI. Use the **Build JAR** job on GitHub as the release gate when local ProGuard only fails on Mac JBR noise after app-level fixes are in. +**macOS local vs CI:** `exportReleaseProguardForCi` on a Mac with JetBrains Runtime (JBR/JCEF) may still fail with dozens of `com.sun.javafx` / `com.sun.glass` “descriptor class” warnings that **do not** reproduce on `ubuntu-latest` CI. Use the **Build JAR** job on GitHub as the release gate when local ProGuard only fails on Mac JBR noise after app-level fixes are in. + +**Incognito / SQLCipher on desktop:** `jvmMain` uses `sqlite-jdbc-crypt` (Willena) plus SQLDelight’s JDBC driver, which normally pulls `org.xerial:sqlite-jdbc`. Two JDBC stacks → ~300 ProGuard “duplicate program class `org.sqlite.*`” errors on CI. Exclude xerial from the SQLDelight driver and keep only `sqlite-jdbc-crypt` (see `app/shared/build.gradle.kts` `jvmMain.dependencies`). ### 3. Version bumped vs latest tag diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts index df6416c..5284794 100644 --- a/app/shared/build.gradle.kts +++ b/app/shared/build.gradle.kts @@ -261,7 +261,10 @@ kotlin { implementation(libs.ktor.client.cio) implementation(libs.ktor.client.okhttp) implementation(libs.multiplatform.crypto.libsodium.bindings) - implementation(libs.sqldelight.driver.sqlite) + implementation("app.cash.sqldelight:sqlite-driver:${libs.versions.sqldelight.get()}") { + // Single org.sqlite.* on the classpath for ProGuard (CI fails on ~300 duplicate defs). + exclude(group = "org.xerial", module = "sqlite-jdbc") + } implementation(libs.sqlite.jdbc.crypt) implementation(libs.bouncycastle.bcprov) implementation(libs.bouncycastle.bcpkix)