Skip to content
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.

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

Api fix #253

Merged
merged 12 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions .idea/runConfigurations/Build.xml

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

19 changes: 19 additions & 0 deletions .idea/runConfigurations/Clippy.xml

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

19 changes: 19 additions & 0 deletions .idea/runConfigurations/Clippy_Pedantic.xml

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

17 changes: 17 additions & 0 deletions .idea/runConfigurations/Install.xml

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

20 changes: 20 additions & 0 deletions .idea/runConfigurations/Run.xml

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

25 changes: 13 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_asset_manager"
version = "3.8.4"
version = "3.8.5"
authors = ["Milan Stastny <[email protected]>"]
edition = "2021"
license-file = "LICENSE"
Expand All @@ -10,18 +10,19 @@ keywords = ["unreal", "engine", "gamedev", "assets", "epic"]
categories = ["gui"]

[dependencies]
adw = { package = "libadwaita", version = "0.3" }
adw = { package = "libadwaita", version = "0.5.3" }
anyhow = "1.0"
byte-unit = "4.0"
async-channel = "2.2"
byte-unit = "5.1"
chrono = "0.4"
diesel = { version = "2.0.0", features = ["sqlite", "r2d2"] }
diesel_migrations = { version = "2.0.0", features = ["sqlite"] }
egs-api = "0.6"
env_logger = "0.10.0"
diesel = { version = "2", features = ["sqlite", "r2d2"] }
diesel_migrations = { version = "2", features = ["sqlite"] }
egs-api = "0.7"
env_logger = "0.11"
fs2 = "0.4.3"
gtk4 = { version = "0.6", features = ["v4_8"] }
gtk4 = { version = "0.7.3", features = ["v4_8"] }
gtk-macros = "0.3"
html2pango = "0.5"
html2pango = "0.6"
lazy_static = "1.4"
libsqlite3-sys = { version = "0.25.2", features = ["bundled"] }
log = "0.4"
Expand All @@ -42,10 +43,10 @@ zip = "0.6"
winres = "0.1"

[target.'cfg(target_os = "windows")'.dependencies]
open = "4"
open = "5.0.0"

[target.'cfg(target_os = "linux")'.dependencies]
ashpd = "0.4"
ashpd = "0.6.8"
gettext-rs = { version = "0.7", features = ["gettext-system"] }
ghregistry = "^0.2"
secret-service = { version = "3.0", features = ["crypto-rust"]}
secret-service = { version = "3.0", features = ["crypto-rust"] }
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"--talk-name=org.freedesktop.secrets",
"--talk-name=org.freedesktop.Flatpak",
"--device=dri",
"--env=RUST_LOG=epic_asset_manager=trace",
"--env=RUST_LOG=debug,epic_asset_manager=trace,egs-api=trace",
"--env=RUST_BACKTRACE=full"
],
"build-options": {
Expand Down Expand Up @@ -49,4 +49,3 @@
}
]
}

26 changes: 26 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash

if [ "$1" = "clean" ]; then
rm -rf .~/.cargo/bin/fenv/ .flatpak-builder/ _build/
~/.cargo/bin/fenv gen build-aux/io.github.achetagames.epic_asset_manager.Devel.json
~/.cargo/bin/fenv exec -- meson --prefix=/app -Dprofile=development _build
exit 0
fi

if [ "$1" = "build" ]; then
~/.cargo/bin/fenv exec -- ninja -C _build
exit 0
fi

if [ "$1" = "install" ]; then
~/.cargo/bin/fenv exec -- ninja -C _build install
exit 0
fi

if [ "$1" = "dist" ]; then
meson dist -C _build
exit 0
fi

~/.cargo/bin/fenv exec -- ninja -C _build install
~/.cargo/bin/fenv run
Loading
Loading