From 8109a826b9a24289aa9f9f7f77445d478a33d739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <41945903+qarmin@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:18:01 +0100 Subject: [PATCH] Version 7.0.0 (#1212) --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- Cargo.lock | 8 ++++---- czkawka_cli/Cargo.toml | 4 ++-- czkawka_core/Cargo.toml | 2 +- czkawka_gui/Cargo.toml | 4 ++-- czkawka_gui/ui/czkawka.cmb | 2 +- data/com.github.qarmin.czkawka.metainfo.xml | 2 +- krokiet/Cargo.toml | 4 ++-- misc/cargo/PublishCore.sh | 2 +- misc/cargo/PublishOther.sh | 16 +++++++++++++++- snap/snapcraft.yaml | 2 +- 11 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e09ee3b..42452b5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -25,7 +25,7 @@ Very helpful in this situation will be logs from czkawka run with RUST_LOG envir
Debug log -# PUT LOGS HERE +# UNCOMMENT DETAILS AND PUT LOGS HERE
``` @@ -33,7 +33,7 @@ Very helpful in this situation will be logs from czkawka run with RUST_LOG envir **System** -- Czkawka/Krokie version: +- Czkawka/Krokiet version: - OS version: - Installation method: diff --git a/Cargo.lock b/Cargo.lock index 62559a1..5ae2bd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1211,7 +1211,7 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "czkawka_cli" -version = "6.1.0" +version = "7.0.0" dependencies = [ "clap", "crossbeam-channel", @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "czkawka_core" -version = "6.1.0" +version = "7.0.0" dependencies = [ "anyhow", "audio_checker", @@ -1275,7 +1275,7 @@ dependencies = [ [[package]] name = "czkawka_gui" -version = "6.1.0" +version = "7.0.0" dependencies = [ "chrono", "crossbeam-channel", @@ -3342,7 +3342,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "krokiet" -version = "6.1.0" +version = "7.0.0" dependencies = [ "chrono", "crossbeam-channel", diff --git a/czkawka_cli/Cargo.toml b/czkawka_cli/Cargo.toml index 5fa4fb5..8a4735e 100644 --- a/czkawka_cli/Cargo.toml +++ b/czkawka_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_cli" -version = "6.1.0" +version = "7.0.0" authors = ["Rafał Mikrut "] edition = "2021" rust-version = "1.74.0" @@ -18,7 +18,7 @@ image_hasher = "1.2" log = "0.4.20" handsome_logger = "0.8" fun_time = { version = "0.3", features = ["log"] } -czkawka_core = { path = "../czkawka_core", version = "6.1.0", features = [] } +czkawka_core = { path = "../czkawka_core", version = "7.0.0", features = [] } indicatif = "0.17" crossbeam-channel = { version = "0.5", features = [] } ctrlc = { version = "3.4", features = ["termination"] } diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml index 7ae6b0f..906e6a0 100644 --- a/czkawka_core/Cargo.toml +++ b/czkawka_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_core" -version = "6.1.0" +version = "7.0.0" authors = ["Rafał Mikrut "] edition = "2021" rust-version = "1.74.0" diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 6ca2932..5bf688c 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_gui" -version = "6.1.0" +version = "7.0.0" authors = ["Rafał Mikrut "] edition = "2021" rust-version = "1.74.0" @@ -52,7 +52,7 @@ handsome_logger = "0.8" fun_time = { version = "0.3", features = ["log"] } rayon = "1.8" -czkawka_core = { path = "../czkawka_core", version = "6.1.0", features = [] } +czkawka_core = { path = "../czkawka_core", version = "7.0.0", features = [] } [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] } diff --git a/czkawka_gui/ui/czkawka.cmb b/czkawka_gui/ui/czkawka.cmb index 32aaeae..4be9585 100755 --- a/czkawka_gui/ui/czkawka.cmb +++ b/czkawka_gui/ui/czkawka.cmb @@ -349,7 +349,7 @@ (3,1,"GtkAboutDialog","license-type","mit-x11",None,None,None,None,None,None,None,None,None), (3,1,"GtkAboutDialog","logo-icon-name","help-about-symbolic",None,None,None,None,None,None,None,None,None), (3,1,"GtkAboutDialog","program-name","Czkawka",None,None,None,None,None,None,None,None,None), - (3,1,"GtkAboutDialog","version","6.1.0",None,None,None,None,None,None,None,None,None), + (3,1,"GtkAboutDialog","version","7.0.0",None,None,None,None,None,None,None,None,None), (4,2,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), (4,2,"GtkWidget","vexpand","1",None,None,None,None,None,None,None,None,None), (4,4,"GtkLabel","label","Group XD/PER XD (99 images in current group)",1,None,None,None,None,None,None,None,None), diff --git a/data/com.github.qarmin.czkawka.metainfo.xml b/data/com.github.qarmin.czkawka.metainfo.xml index 0c3e3b9..8c91490 100644 --- a/data/com.github.qarmin.czkawka.metainfo.xml +++ b/data/com.github.qarmin.czkawka.metainfo.xml @@ -19,7 +19,7 @@ - + Rafał Mikrut diff --git a/krokiet/Cargo.toml b/krokiet/Cargo.toml index 4d733c6..bfb3e7d 100644 --- a/krokiet/Cargo.toml +++ b/krokiet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "krokiet" -version = "6.1.0" +version = "7.0.0" authors = ["Rafał Mikrut "] edition = "2021" rust-version = "1.74.0" @@ -12,7 +12,7 @@ build = "build.rs" [dependencies] rand = "0.8" -czkawka_core = { version = "6.1.0", path = "../czkawka_core" } +czkawka_core = { version = "7.0.0", path = "../czkawka_core" } chrono = "0.4.34" open = "5.0" crossbeam-channel = "0.5" diff --git a/misc/cargo/PublishCore.sh b/misc/cargo/PublishCore.sh index 41a9a88..218bf37 100755 --- a/misc/cargo/PublishCore.sh +++ b/misc/cargo/PublishCore.sh @@ -1,5 +1,5 @@ #!/bin/bash -NUMBER="6.1.0" +NUMBER="7.0.0" CZKAWKA_PATH="/home/rafal" cd "$CZKAWKA_PATH" diff --git a/misc/cargo/PublishOther.sh b/misc/cargo/PublishOther.sh index 216a2a3..d4681e6 100755 --- a/misc/cargo/PublishOther.sh +++ b/misc/cargo/PublishOther.sh @@ -1,5 +1,5 @@ #!/bin/bash -NUMBER="6.1.0" +NUMBER="7.0.0" CZKAWKA_PATH="/home/rafal" cd "$CZKAWKA_PATH" @@ -29,6 +29,15 @@ then fi git reset --hard +cd "$CZKAWKA_PATH/krokiet" +cargo package +if [ $(echo $?) != "0" ] +then + echo "Cargo package failed krokiet" + exit 1 +fi +git reset --hard + @@ -41,3 +50,8 @@ cd "$CZKAWKA_PATH/czkawka_gui" # sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui/Cargo.toml" cargo publish # --allow-dirty git reset --hard + +cd "$CZKAWKA_PATH/krokiet" +# sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui/Cargo.toml" +cargo publish # --allow-dirty +git reset --hard diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 73645a3..b2edee6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: czkawka # you probably want to 'snapcraft register ' base: core22 # the base snap is the execution environment for this snap -version: '6.1.0' # just for humans, typically '1.2+git' or '1.3.2' +version: '7.0.0' # just for humans, typically '1.2+git' or '1.3.2' summary: Czkawka - fast data cleaner written in Rust # 79 char long summary description: | Czkawka is very fast and feature rich cleaner which finds file duplicates, empty folders and files, duplicated music, similar images or the biggest files in selected directories.