From fcc856279c8c97dbd9c3ccf5ddc63d03c14e74fe Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 31 May 2026 22:31:39 +0100 Subject: [PATCH] Bump versions to 0.12.1 --- Cargo.lock | 2 +- Cargo.toml | 2 +- examples/website/package-lock.json | 2 +- reconcile-js/package-lock.json | 6 +++--- reconcile-js/package.json | 2 +- reconcile-python/Cargo.lock | 4 ++-- reconcile-python/Cargo.toml | 2 +- reconcile-python/pyproject.toml | 2 +- reconcile-python/uv.lock | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b371452..0971f12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "reconcile-text" -version = "0.12.0" +version = "0.12.1" dependencies = [ "console_error_panic_hook", "diff-match-patch-rs", diff --git a/Cargo.toml b/Cargo.toml index 5e60f78..21ff69b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "reconcile-text" description = "Intelligent 3-way text merging with automated conflict resolution" -version = "0.12.0" +version = "0.12.1" rust-version = "1.94" authors = ["Andras Schmelczer "] edition = "2024" diff --git a/examples/website/package-lock.json b/examples/website/package-lock.json index a9369d7..cfab4c3 100644 --- a/examples/website/package-lock.json +++ b/examples/website/package-lock.json @@ -28,7 +28,7 @@ }, "../../reconcile-js": { "name": "reconcile-text", - "version": "0.12.0", + "version": "0.12.1", "dev": true, "license": "MIT", "devDependencies": { diff --git a/reconcile-js/package-lock.json b/reconcile-js/package-lock.json index b1a50b6..397ff47 100644 --- a/reconcile-js/package-lock.json +++ b/reconcile-js/package-lock.json @@ -1,12 +1,12 @@ { "name": "reconcile-text", - "version": "0.12.0", + "version": "0.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "reconcile-text", - "version": "0.12.0", + "version": "0.12.1", "license": "MIT", "devDependencies": { "@types/jest": "^30.0.0", @@ -25,7 +25,7 @@ }, "../pkg": { "name": "reconcile-text", - "version": "0.12.0", + "version": "0.12.1", "dev": true, "license": "MIT" }, diff --git a/reconcile-js/package.json b/reconcile-js/package.json index da3a0ce..7bf8edf 100644 --- a/reconcile-js/package.json +++ b/reconcile-js/package.json @@ -1,6 +1,6 @@ { "name": "reconcile-text", - "version": "0.12.0", + "version": "0.12.1", "description": "Intelligent 3-way text merging with automated conflict resolution", "main": "dist/reconcile.node.js", "browser": "dist/reconcile.web.js", diff --git a/reconcile-python/Cargo.lock b/reconcile-python/Cargo.lock index e11ceeb..1ea367b 100644 --- a/reconcile-python/Cargo.lock +++ b/reconcile-python/Cargo.lock @@ -130,14 +130,14 @@ dependencies = [ [[package]] name = "reconcile-text" -version = "0.12.0" +version = "0.12.1" dependencies = [ "thiserror", ] [[package]] name = "reconcile-text-python" -version = "0.12.0" +version = "0.12.1" dependencies = [ "pyo3", "reconcile-text", diff --git a/reconcile-python/Cargo.toml b/reconcile-python/Cargo.toml index dd018ff..37facf0 100644 --- a/reconcile-python/Cargo.toml +++ b/reconcile-python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reconcile-text-python" -version = "0.12.0" +version = "0.12.1" edition = "2024" rust-version = "1.94" authors = ["Andras Schmelczer "] diff --git a/reconcile-python/pyproject.toml b/reconcile-python/pyproject.toml index ba367f2..b3b16e7 100644 --- a/reconcile-python/pyproject.toml +++ b/reconcile-python/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "reconcile-text" -version = "0.12.0" +version = "0.12.1" description = "Intelligent 3-way text merging with automated conflict resolution" readme = "README.md" license = { text = "MIT" } diff --git a/reconcile-python/uv.lock b/reconcile-python/uv.lock index 8a3d3a4..6e5156f 100644 --- a/reconcile-python/uv.lock +++ b/reconcile-python/uv.lock @@ -168,7 +168,7 @@ wheels = [ [[package]] name = "reconcile-text" -version = "0.12.0" +version = "0.12.1" source = { editable = "." } [package.dev-dependencies]