Skip to content

Commit 8dd32bb

Browse files
Fix macOS Theseus build issue, cleanup platform specific code (modrinth#3604)
* chore(theseus): significantly cleanup MacOS-specific code * fix(labrinth): only use jemalloc allocator for Linux targets The upstream crate asserts that its tests only pass for Linux targets, and there's little point in supporting other OS for now since practical Labrinth deployments run under a Linux environment anyway. This change made it easier for me to cross-compile Labrinth. * chore(theseus): tweak traffic lights pos according to modrinth@c39bb78 As far as I understand it, that PR introduced the seemingly ad-hoc additions of 6 and 12 units to the traffic light position calculations, not directly modifying the `const` values introduced by modrinth@d6a72fb. * fix: re-enable app window shadows on Linux * chore: log `window.set_shadow` errors * chore: trigger CI
1 parent f71830e commit 8dd32bb

File tree

15 files changed

+146
-691
lines changed

15 files changed

+146
-691
lines changed

Cargo.lock

+15-146
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/app-frontend/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
"@modrinth/utils": "workspace:*",
1818
"@sentry/vue": "^8.27.0",
1919
"@geometrically/minecraft-motd-parser": "^1.1.4",
20-
"@tauri-apps/api": "^2.1.1",
21-
"@tauri-apps/plugin-dialog": "^2.2.0",
22-
"@tauri-apps/plugin-os": "^2.2.0",
23-
"@tauri-apps/plugin-opener": "^2.2.1",
24-
"@tauri-apps/plugin-updater": "^2.3.0",
25-
"@tauri-apps/plugin-window-state": "^2.2.0",
20+
"@tauri-apps/api": "^2.5.0",
21+
"@tauri-apps/plugin-dialog": "^2.2.1",
22+
"@tauri-apps/plugin-os": "^2.2.1",
23+
"@tauri-apps/plugin-opener": "^2.2.6",
24+
"@tauri-apps/plugin-updater": "^2.7.1",
25+
"@tauri-apps/plugin-window-state": "^2.2.2",
2626
"@vintl/vintl": "^4.4.1",
2727
"dayjs": "^1.11.10",
2828
"floating-vue": "^5.2.2",

apps/app/Cargo.toml

-9
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ either = "1.15"
3535
url = "2.2"
3636
urlencoding = "2.1"
3737
uuid = { version = "1.1", features = ["serde", "v4"] }
38-
os_info = "3.7.0"
3938

4039
tracing = "0.1.37"
4140
tracing-error = "0.2.0"
@@ -48,14 +47,6 @@ opener = { version = "0.7.2", features = ["reveal", "dbus-vendored"] }
4847

4948
native-dialog = "0.9.0"
5049

51-
[target.'cfg(not(target_os = "linux"))'.dependencies]
52-
window-shadows = "0.2.1"
53-
54-
[target.'cfg(target_os = "macos")'.dependencies]
55-
cocoa = "0.26.0"
56-
objc = "0.2.7"
57-
rand = "0.9.1"
58-
5950
[target.'cfg(target_os = "linux")'.dependencies]
6051
tauri-plugin-updater = { version = "2.3.0", optional = true, features = ["native-tls-vendored", "zip"], default-features = false }
6152

apps/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"fix": "cargo fmt && cargo clippy --fix"
1010
},
1111
"devDependencies": {
12-
"@tauri-apps/cli": "2.1.0"
12+
"@tauri-apps/cli": "2.5.0"
1313
},
1414
"dependencies": {
1515
"@modrinth/app-frontend": "workspace:*",

0 commit comments

Comments
 (0)