Merge 'rel-train-24.12.2'

Signed-off-by: 35V LG84 <[email protected]>
e257-fi · Dec 26, 2024 · 081baed · 081baed
2 parents 6604fef + adcbb67
commit 081baed
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 40 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -5,10 +5,10 @@
 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"
 ....
 
 
@@ -18,12 +18,57 @@ tackler-core = "0.6.0"
 
 [cols="1,2",width=50%]
 |===
-|Component | Version
+|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 ...
+
 
-|Tackler CLI  | 24.12.2-dev
-|tackler-core | 0.7.0-dev
-|tackler-api  | 0.7.0-dev
-|tackler-rs   | 0.7.0-dev
+==== Development
+
+Updated deps and tools:
+
+* Dependencies
+** ...
+
+===== Rust toolchain
+
+MSRV: 1.81.0
+
+'''
+
+
+=== Tackler release 24.12.2
+
+[cols="1,2",width=50%]
+|===
+|Component    | Version
+
+|Tackler CLI  | 24.12.2
+|tackler-core | 0.7.0
+|tackler-api  | 0.7.0
+|tackler-rs   | 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.
@@ -50,14 +95,14 @@ 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
 
 ===== Rust toolchain
 
-MSRV: 1.77.2
+MSRV: 1.81.0
 
 '''
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git 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

diff --git 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/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
@@ -15,7 +15,7 @@
 #
 [package]
 name = "tackler-api"
-version = "0.7.0-dev"
+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-dev" }
+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
@@ -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/), 
@@ -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
@@ -15,7 +15,7 @@
 #
 [package]
 name = "tackler"
-version = "24.12.2-dev"
+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-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.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
@@ -15,7 +15,7 @@
 #
 [package]
 name = "tackler-core"
-version = "0.7.0-dev"
+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-dev" }
-tackler-rs =   { path = "../tackler-rs",   version = "0.7.0-dev" }
+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 }
@@ -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]

diff --git 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.8.0-dev"
 description = "Rusty Services for Tackler accounting engine with native GIT SCM support"
 edition.workspace = true
 license.workspace = true