Bump versions to 0.14.0
Some checks failed
Check / build (push) Failing after 3m21s
Publish / build (push) Failing after 3m15s
Publish / publish-crate (push) Has been skipped
Publish / publish-npm (push) Has been skipped
Publish / publish-pypi (push) Has been skipped

This commit is contained in:
Andras Schmelczer 2026-10-29 00:01:23 +00:00
commit 4d977fc70d
9 changed files with 28 additions and 28 deletions

2
Cargo.lock generated
View file

@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]] [[package]]
name = "reconcile-text" name = "reconcile-text"
version = "0.13.2" version = "0.14.0"
dependencies = [ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"diff-match-patch-rs", "diff-match-patch-rs",

View file

@ -1,7 +1,7 @@
[package] [package]
name = "reconcile-text" name = "reconcile-text"
description = "Intelligent 3-way text merging with automated conflict resolution" description = "Intelligent 3-way text merging with automated conflict resolution"
version = "0.13.2" version = "0.14.0"
rust-version = "1.94" rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"] authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
edition = "2024" edition = "2024"

View file

@ -28,13 +28,13 @@
}, },
"../../pkg": { "../../pkg": {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.13.2", "version": "0.14.0",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"../../reconcile-js": { "../../reconcile-js": {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.13.2", "version": "0.14.0",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {

View file

@ -1,12 +1,12 @@
{ {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.13.2", "version": "0.14.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.13.2", "version": "0.14.0",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@types/jest": "^30.0.0", "@types/jest": "^30.0.0",
@ -25,7 +25,7 @@
}, },
"../pkg": { "../pkg": {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.13.2", "version": "0.14.0",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },

View file

@ -1,6 +1,6 @@
{ {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.13.2", "version": "0.14.0",
"description": "Intelligent 3-way text merging with automated conflict resolution", "description": "Intelligent 3-way text merging with automated conflict resolution",
"main": "dist/reconcile.node.js", "main": "dist/reconcile.node.js",
"browser": "dist/reconcile.web.js", "browser": "dist/reconcile.web.js",

View file

@ -130,14 +130,14 @@ dependencies = [
[[package]] [[package]]
name = "reconcile-text" name = "reconcile-text"
version = "0.13.2" version = "0.14.0"
dependencies = [ dependencies = [
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "reconcile-text-python" name = "reconcile-text-python"
version = "0.13.2" version = "0.14.0"
dependencies = [ dependencies = [
"pyo3", "pyo3",
"reconcile-text", "reconcile-text",

View file

@ -1,6 +1,6 @@
[package] [package]
name = "reconcile-text-python" name = "reconcile-text-python"
version = "0.13.2" version = "0.14.0"
edition = "2024" edition = "2024"
rust-version = "1.94" rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"] authors = ["Andras Schmelczer <andras@schmelczer.dev>"]

View file

@ -4,7 +4,7 @@ build-backend = "maturin"
[project] [project]
name = "reconcile-text" name = "reconcile-text"
version = "0.13.2" version = "0.14.0"
description = "Intelligent 3-way text merging with automated conflict resolution" description = "Intelligent 3-way text merging with automated conflict resolution"
readme = "README.md" readme = "README.md"
license = { file = "LICENSE" } license = { file = "LICENSE" }

View file

@ -20,7 +20,7 @@ name = "exceptiongroup"
version = "1.3.1" version = "1.3.1"
source = { registry = "https://pypi.org/simple" } source = { registry = "https://pypi.org/simple" }
dependencies = [ dependencies = [
{ name = "typing-extensions" }, { name = "typing-extensions", marker = "python_full_version < '3.13'" },
] ]
sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" } sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
wheels = [ wheels = [
@ -132,13 +132,13 @@ resolution-markers = [
"python_full_version < '3.10'", "python_full_version < '3.10'",
] ]
dependencies = [ dependencies = [
{ name = "colorama", marker = "sys_platform == 'win32'" }, { name = "colorama", marker = "python_full_version < '3.10' and sys_platform == 'win32'" },
{ name = "exceptiongroup" }, { name = "exceptiongroup", marker = "python_full_version < '3.10'" },
{ name = "iniconfig", version = "2.1.0", source = { registry = "https://pypi.org/simple" } }, { name = "iniconfig", version = "2.1.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" },
{ name = "packaging" }, { name = "packaging", marker = "python_full_version < '3.10'" },
{ name = "pluggy" }, { name = "pluggy", marker = "python_full_version < '3.10'" },
{ name = "pygments" }, { name = "pygments", marker = "python_full_version < '3.10'" },
{ name = "tomli" }, { name = "tomli", marker = "python_full_version < '3.10'" },
] ]
sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" } sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" }
wheels = [ wheels = [
@ -153,13 +153,13 @@ resolution-markers = [
"python_full_version >= '3.10'", "python_full_version >= '3.10'",
] ]
dependencies = [ dependencies = [
{ name = "colorama", marker = "sys_platform == 'win32'" }, { name = "colorama", marker = "python_full_version >= '3.10' and sys_platform == 'win32'" },
{ name = "exceptiongroup", marker = "python_full_version < '3.11'" }, { name = "exceptiongroup", marker = "python_full_version == '3.10.*'" },
{ name = "iniconfig", version = "2.3.0", source = { registry = "https://pypi.org/simple" } }, { name = "iniconfig", version = "2.3.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" },
{ name = "packaging" }, { name = "packaging", marker = "python_full_version >= '3.10'" },
{ name = "pluggy" }, { name = "pluggy", marker = "python_full_version >= '3.10'" },
{ name = "pygments" }, { name = "pygments", marker = "python_full_version >= '3.10'" },
{ name = "tomli", marker = "python_full_version < '3.11'" }, { name = "tomli", marker = "python_full_version == '3.10.*'" },
] ]
sdist = { url = "https://files.pythonhosted.org/packages/d1/db/7ef3487e0fb0049ddb5ce41d3a49c235bf9ad299b6a25d5780a89f19230f/pytest-9.0.2.tar.gz", hash = "sha256:75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11", size = 1568901, upload-time = "2025-12-06T21:30:51.014Z" } sdist = { url = "https://files.pythonhosted.org/packages/d1/db/7ef3487e0fb0049ddb5ce41d3a49c235bf9ad299b6a25d5780a89f19230f/pytest-9.0.2.tar.gz", hash = "sha256:75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11", size = 1568901, upload-time = "2025-12-06T21:30:51.014Z" }
wheels = [ wheels = [
@ -168,7 +168,7 @@ wheels = [
[[package]] [[package]]
name = "reconcile-text" name = "reconcile-text"
version = "0.13.2" version = "0.14.0"
source = { editable = "." } source = { editable = "." }
[package.dev-dependencies] [package.dev-dependencies]