diff --git a/.github/workflows/desktop-publish.yml b/.github/workflows/desktop-publish.yml index 1e24daa..0929fae 100644 --- a/.github/workflows/desktop-publish.yml +++ b/.github/workflows/desktop-publish.yml @@ -19,8 +19,8 @@ jobs: - platform: "macos-13" # for Intel based macs. args: "--target x86_64-apple-darwin --verbose" # Universal Build no longer supported after adding openssl, which is not cross-compilable. - # - platform: "macos-14" # for Both Arm and Intel based macs. - # args: "--target universal-apple-darwin --verbose" + - platform: "macos-14" # for Both Arm and Intel based macs. + args: "--target universal-apple-darwin --verbose" - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. args: "--verbose" - platform: "windows-latest" diff --git a/Cargo.lock b/Cargo.lock index 53de7ce..2ddc826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3965,6 +3965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", + "openssl-sys", "pkg-config", "vcpkg", ] @@ -4879,6 +4880,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.104" @@ -4887,6 +4897,7 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/packages/db/Cargo.toml b/packages/db/Cargo.toml index b1828a0..e7d9e9b 100644 --- a/packages/db/Cargo.toml +++ b/packages/db/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -rusqlite = { version = "0.31.0", features = ["bundled", "bundled-sqlcipher"] } +rusqlite = { version = "0.31.0", features = ["bundled-sqlcipher-vendored-openssl"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tempfile = "3.10.1"