From 1c4815900554953536e3aab59d45eeada963defc Mon Sep 17 00:00:00 2001 From: 35V LG84 <35vlg84-x4e6b92@e257.fi> Date: Thu, 26 Dec 2024 06:36:36 +0200 Subject: [PATCH 1/4] Pump MSRV to 1.81.0 This version is needed by gix-path (home v0.5.11) Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi> --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 20ca59a..c6e6e31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ repository = "https://github.com/e257-fi/tackler-ng" categories = [ "finance", "parser-implementations" ] keywords = [ "accounting", "finance" ] include = [ "src/**/*", "CRATES.md", "README.adoc", "build.rs" ] -rust-version = "1.77.2" +rust-version = "1.81.0" [profile.test] # tackler-core tests would be too slow without this From 4f6698d83fbf39906a48e6b474c4af72c7423858 Mon Sep 17 00:00:00 2001 From: 35V LG84 <35vlg84-x4e6b92@e257.fi> Date: Thu, 26 Dec 2024 06:56:33 +0200 Subject: [PATCH 2/4] Update deps (Gix 0.69.1) Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi> --- CHANGELOG.adoc | 2 +- Cargo.lock | 4 ++-- tackler-core/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index b3883e2..4f06503 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -50,7 +50,7 @@ Fixes in this release: Updated dependencies and tools: * Dependencies -** gix: 0.69.0 +** gix: 0.69.1 ** serde: 1.0.216 ** serde_json: 1.0.134 ** serde_regex: removed diff --git a/Cargo.lock b/Cargo.lock index 4d2ceae..583e945 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -520,9 +520,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.69.0" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46db6f5931c1607c9f71b950d0abfe067113526ceaf7d10b2285c07d5b2cef29" +checksum = "8d0eebdaecdcf405d5433a36f85e4f058cf4de48ee2604388be0dbccbaad353e" dependencies = [ "gix-actor", "gix-commitgraph", diff --git a/tackler-core/Cargo.toml b/tackler-core/Cargo.toml index 532f750..8fdfb1d 100644 --- a/tackler-core/Cargo.toml +++ b/tackler-core/Cargo.toml @@ -47,7 +47,7 @@ sha2 = "0.10.8" sha3 = "0.10.8" digest = "0.10.7" -gix = { version = "0.69.0", default-features = false, features = ["max-performance-safe", "revision"] } +gix = { version = "0.69.1", default-features = false, features = ["max-performance-safe", "revision"] } toml = "0.8.19" [target.'cfg(not(target_env = "msvc"))'.dependencies] From 9d617ff4f95a94a6702dded0bf1b298af0e2c590 Mon Sep 17 00:00:00 2001 From: 35V LG84 <35vlg84-x4e6b92@e257.fi> Date: Thu, 26 Dec 2024 07:12:57 +0200 Subject: [PATCH 3/4] Release 24.12.2 Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi> --- CHANGELOG.adoc | 18 +++++++++--------- Cargo.lock | 8 ++++---- README.adoc | 4 ++-- tackler-api/Cargo.toml | 4 ++-- tackler-cli/CRATES.md | 4 ++-- tackler-cli/Cargo.toml | 8 ++++---- tackler-core/Cargo.toml | 6 +++--- tackler-rs/Cargo.toml | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 4f06503..5f3ed34 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -5,25 +5,25 @@ Currently published crates are: .... -tackler = "24.12.1" -tackler-rs = "0.6.0" -tackler-api = "0.6.0" -tackler-core = "0.6.0" +tackler = "24.12.2" +tackler-rs = "0.7.0" +tackler-api = "0.7.0" +tackler-core = "0.7.0" .... == Releases -=== Tackler release XX.YY.Z +=== Tackler release 24.12.2 [cols="1,2",width=50%] |=== |Component | Version -|Tackler CLI | 24.12.2-dev -|tackler-core | 0.7.0-dev -|tackler-api | 0.7.0-dev -|tackler-rs | 0.7.0-dev +|Tackler CLI | 24.12.2 +|tackler-core | 0.7.0 +|tackler-api | 0.7.0 +|tackler-rs | 0.7.0 |=== diff --git a/Cargo.lock b/Cargo.lock index 583e945..5872c59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1991,7 +1991,7 @@ dependencies = [ [[package]] name = "tackler" -version = "24.12.2-dev" +version = "24.12.2" dependencies = [ "clap", "log", @@ -2004,7 +2004,7 @@ dependencies = [ [[package]] name = "tackler-api" -version = "0.7.0-dev" +version = "0.7.0" dependencies = [ "base64", "indoc", @@ -2021,7 +2021,7 @@ dependencies = [ [[package]] name = "tackler-core" -version = "0.7.0-dev" +version = "0.7.0" dependencies = [ "antlr-rust", "digest", @@ -2046,7 +2046,7 @@ dependencies = [ [[package]] name = "tackler-rs" -version = "0.7.0-dev" +version = "0.7.0" dependencies = [ "indoc", "log", diff --git a/README.adoc b/README.adoc index 25b2931..8a28952 100644 --- a/README.adoc +++ b/README.adoc @@ -97,8 +97,8 @@ cd tackler-ng # To build a release, check relased versions: git tag -l -# Get the release, e.g. v24.12.1 -git checkout v24.12.1 +# Get the release, e.g. v24.12.2 +git checkout v24.12.2 # Build tackler cargo build --release --locked --bin tackler diff --git a/tackler-api/Cargo.toml b/tackler-api/Cargo.toml index 1331d49..cf8c441 100644 --- a/tackler-api/Cargo.toml +++ b/tackler-api/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler-api" -version = "0.7.0-dev" +version = "0.7.0" description = "API components for Tackler accounting engine with native GIT SCM support" edition.workspace = true license.workspace = true @@ -37,7 +37,7 @@ regex = { workspace = true } rust_decimal = { workspace = true } serde = { workspace = true, features = [ "derive"] } serde_json = { workspace = true } -tackler-rs = { path = "../tackler-rs", version = "0.7.0-dev" } +tackler-rs = { path = "../tackler-rs", version = "0.7.0" } time = { workspace = true, features = [ "serde-human-readable", "formatting", "parsing" ] } time-tz = { workspace = true } uuid = { workspace = true } diff --git a/tackler-cli/CRATES.md b/tackler-cli/CRATES.md index e77660f..835c0fb 100644 --- a/tackler-cli/CRATES.md +++ b/tackler-cli/CRATES.md @@ -65,8 +65,8 @@ cd tackler-ng # To build a release, check relased versions: git tag -l -# Get the release, e.g. v24.12.1 -git checkout v24.12.1 +# Get the release, e.g. v24.12.2 +git checkout v24.12.2 # Build tackler cargo build --release --locked --bin tackler diff --git a/tackler-cli/Cargo.toml b/tackler-cli/Cargo.toml index 97555ce..d7f5858 100644 --- a/tackler-cli/Cargo.toml +++ b/tackler-cli/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler" -version = "24.12.2-dev" +version = "24.12.2" description = "Fast, reliable bookkeeping tool with native GIT SCM support for plain text accounting" edition.workspace = true license.workspace = true @@ -28,9 +28,9 @@ rust-version.workspace = true readme = "CRATES.md" [dependencies] -tackler-rs = { path = "../tackler-rs", version = "0.7.0-dev" } -tackler-api = { path = "../tackler-api", version = "0.7.0-dev" } -tackler-core = { path = "../tackler-core", version = "0.7.0-dev" } +tackler-rs = { path = "../tackler-rs", version = "0.7.0" } +tackler-api = { path = "../tackler-api", version = "0.7.0" } +tackler-core = { path = "../tackler-core", version = "0.7.0" } log = { workspace = true } clap = { version = "4.5.20", features = [ "derive" ] } time-tz = { workspace = true } diff --git a/tackler-core/Cargo.toml b/tackler-core/Cargo.toml index 8fdfb1d..e57ddf3 100644 --- a/tackler-core/Cargo.toml +++ b/tackler-core/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler-core" -version = "0.7.0-dev" +version = "0.7.0" description = "Core components for Tackler accounting engine with native GIT SCM support" edition.workspace = true license.workspace = true @@ -32,8 +32,8 @@ name = "tackler_core" path = "src/lib.rs" [dependencies] -tackler-api = { path = "../tackler-api", version = "0.7.0-dev" } -tackler-rs = { path = "../tackler-rs", version = "0.7.0-dev" } +tackler-api = { path = "../tackler-api", version = "0.7.0" } +tackler-rs = { path = "../tackler-rs", version = "0.7.0" } antlr-rust = "0.3.0-beta" log = { workspace = true } rust_decimal = { workspace = true } diff --git a/tackler-rs/Cargo.toml b/tackler-rs/Cargo.toml index 1ce0cdd..a3f0052 100644 --- a/tackler-rs/Cargo.toml +++ b/tackler-rs/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler-rs" -version = "0.7.0-dev" +version = "0.7.0" description = "Rusty Services for Tackler accounting engine with native GIT SCM support" edition.workspace = true license.workspace = true From adcbb6730c58afececfbc149323064dafa8b4d2c Mon Sep 17 00:00:00 2001 From: 35V LG84 <35vlg84-x4e6b92@e257.fi> Date: Thu, 26 Dec 2024 08:01:17 +0200 Subject: [PATCH 4/4] Start next development cycle Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi> --- CHANGELOG.adoc | 51 +++++++++++++++++++++++++++++++++++++--- Cargo.lock | 8 +++---- docs/rel-entry-tmpl.adoc | 11 +++++---- tackler-api/Cargo.toml | 4 ++-- tackler-cli/CRATES.md | 2 +- tackler-cli/Cargo.toml | 8 +++---- tackler-core/Cargo.toml | 6 ++--- tackler-rs/Cargo.toml | 2 +- 8 files changed, 69 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 5f3ed34..33e24ab 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -14,11 +14,56 @@ tackler-core = "0.7.0" == Releases +=== Tackler release XX.YY.Z + +[cols="1,2",width=50%] +|=== +|Component | Version + +|Tackler CLI | TODO: XX.YY.Z +|tackler-core | TODO: No changes +|tackler-api | TODO: No changes +|tackler-rs | TODO: No changes +|=== + + +==== New features and changes + +New features: + +* ... +** ... + +Changed functionality: + +* ... +** ... + + +==== Fixes + +Fixes in this release ... + + +==== Development + +Updated deps and tools: + +* Dependencies +** ... + +===== Rust toolchain + +MSRV: 1.81.0 + +''' + + === Tackler release 24.12.2 [cols="1,2",width=50%] |=== -|Component | Version +|Component | Version |Tackler CLI | 24.12.2 |tackler-core | 0.7.0 @@ -40,7 +85,7 @@ New features: Fixes in this release: -* Git Backend: When opening the repo, use exact location, +* Git Backend: When opening the repo, use exact location, and don't search upwards on the directory tree * Implement Tackler-Mk1 and JDK compatible full string (haystack) regex matcher. This change is affecting Account Selectors which use regex. @@ -57,7 +102,7 @@ Updated dependencies and tools: ===== Rust toolchain -MSRV: 1.77.2 +MSRV: 1.81.0 ''' diff --git a/Cargo.lock b/Cargo.lock index 5872c59..e3a5a0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1991,7 +1991,7 @@ dependencies = [ [[package]] name = "tackler" -version = "24.12.2" +version = "25.1.1-dev" dependencies = [ "clap", "log", @@ -2004,7 +2004,7 @@ dependencies = [ [[package]] name = "tackler-api" -version = "0.7.0" +version = "0.8.0-dev" dependencies = [ "base64", "indoc", @@ -2021,7 +2021,7 @@ dependencies = [ [[package]] name = "tackler-core" -version = "0.7.0" +version = "0.8.0-dev" dependencies = [ "antlr-rust", "digest", @@ -2046,7 +2046,7 @@ dependencies = [ [[package]] name = "tackler-rs" -version = "0.7.0" +version = "0.8.0-dev" dependencies = [ "indoc", "log", diff --git a/docs/rel-entry-tmpl.adoc b/docs/rel-entry-tmpl.adoc index 776995a..d4e816f 100644 --- a/docs/rel-entry-tmpl.adoc +++ b/docs/rel-entry-tmpl.adoc @@ -3,7 +3,7 @@ [cols="1,2",width=50%] |=== -|Component | Version +|Component | Version |Tackler CLI | TODO: XX.YY.Z |tackler-core | TODO: No changes @@ -36,10 +36,11 @@ Updated deps and tools: * Dependencies ** ... -* Build - ** ... -* Tests - ** ... + +===== Rust toolchain + +MSRV: X.YY.Z + ''' diff --git a/tackler-api/Cargo.toml b/tackler-api/Cargo.toml index cf8c441..39c9d52 100644 --- a/tackler-api/Cargo.toml +++ b/tackler-api/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler-api" -version = "0.7.0" +version = "0.8.0-dev" description = "API components for Tackler accounting engine with native GIT SCM support" edition.workspace = true license.workspace = true @@ -37,7 +37,7 @@ regex = { workspace = true } rust_decimal = { workspace = true } serde = { workspace = true, features = [ "derive"] } serde_json = { workspace = true } -tackler-rs = { path = "../tackler-rs", version = "0.7.0" } +tackler-rs = { path = "../tackler-rs", version = "0.8.0-dev" } time = { workspace = true, features = [ "serde-human-readable", "formatting", "parsing" ] } time-tz = { workspace = true } uuid = { workspace = true } diff --git a/tackler-cli/CRATES.md b/tackler-cli/CRATES.md index 835c0fb..3b9d93c 100644 --- a/tackler-cli/CRATES.md +++ b/tackler-cli/CRATES.md @@ -29,7 +29,7 @@ Balance Report Tackler-NG is in [feature](https://tackler.e257.fi/features/) parity with the old scala based Tackler CLI, and Tackler-NG will be the basis of all future Tackler development. -**NOTE: Tackler-NG is tested with 284 of tackler's test vectors at the moment** +**NOTE: Tackler-NG is tested with 306 of tackler's test vectors at the moment** All Tackler CLI functionality is supported, including [Tackler Journal Format](https://tackler.e257.fi/docs/journal/format/), diff --git a/tackler-cli/Cargo.toml b/tackler-cli/Cargo.toml index d7f5858..c21b712 100644 --- a/tackler-cli/Cargo.toml +++ b/tackler-cli/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler" -version = "24.12.2" +version = "25.1.1-dev" description = "Fast, reliable bookkeeping tool with native GIT SCM support for plain text accounting" edition.workspace = true license.workspace = true @@ -28,9 +28,9 @@ rust-version.workspace = true readme = "CRATES.md" [dependencies] -tackler-rs = { path = "../tackler-rs", version = "0.7.0" } -tackler-api = { path = "../tackler-api", version = "0.7.0" } -tackler-core = { path = "../tackler-core", version = "0.7.0" } +tackler-rs = { path = "../tackler-rs", version = "0.8.0-dev" } +tackler-api = { path = "../tackler-api", version = "0.8.0-dev" } +tackler-core = { path = "../tackler-core", version = "0.8.0-dev" } log = { workspace = true } clap = { version = "4.5.20", features = [ "derive" ] } time-tz = { workspace = true } diff --git a/tackler-core/Cargo.toml b/tackler-core/Cargo.toml index e57ddf3..e8dfcf6 100644 --- a/tackler-core/Cargo.toml +++ b/tackler-core/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler-core" -version = "0.7.0" +version = "0.8.0-dev" description = "Core components for Tackler accounting engine with native GIT SCM support" edition.workspace = true license.workspace = true @@ -32,8 +32,8 @@ name = "tackler_core" path = "src/lib.rs" [dependencies] -tackler-api = { path = "../tackler-api", version = "0.7.0" } -tackler-rs = { path = "../tackler-rs", version = "0.7.0" } +tackler-api = { path = "../tackler-api", version = "0.8.0-dev" } +tackler-rs = { path = "../tackler-rs", version = "0.8.0-dev" } antlr-rust = "0.3.0-beta" log = { workspace = true } rust_decimal = { workspace = true } diff --git a/tackler-rs/Cargo.toml b/tackler-rs/Cargo.toml index a3f0052..d9b4a5a 100644 --- a/tackler-rs/Cargo.toml +++ b/tackler-rs/Cargo.toml @@ -15,7 +15,7 @@ # [package] name = "tackler-rs" -version = "0.7.0" +version = "0.8.0-dev" description = "Rusty Services for Tackler accounting engine with native GIT SCM support" edition.workspace = true license.workspace = true