Compare commits

...

2 commits

Author SHA1 Message Date
dba62525db Bump versions to 0.12.1
All checks were successful
Check / build (pull_request) Successful in 9m14s
2026-06-01 07:45:07 +01:00
60aeb9e3eb Fix windows build 2026-06-01 07:45:07 +01:00
9 changed files with 44 additions and 12 deletions

2
Cargo.lock generated
View file

@ -429,7 +429,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]] [[package]]
name = "reconcile-text" name = "reconcile-text"
version = "0.12.0" version = "0.12.1"
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.12.0" version = "0.12.1"
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,7 +28,7 @@
}, },
"../../reconcile-js": { "../../reconcile-js": {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.12.0", "version": "0.12.1",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {

View file

@ -1,12 +1,12 @@
{ {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.12.0", "version": "0.12.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.12.0", "version": "0.12.1",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@types/jest": "^30.0.0", "@types/jest": "^30.0.0",

View file

@ -1,6 +1,6 @@
{ {
"name": "reconcile-text", "name": "reconcile-text",
"version": "0.12.0", "version": "0.12.1",
"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

@ -2,6 +2,22 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 4 version = 4
[[package]]
name = "cc"
version = "1.2.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
dependencies = [
"find-msvc-tools",
"shlex",
]
[[package]]
name = "find-msvc-tools"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.5.0" version = "0.5.0"
@ -55,6 +71,7 @@ version = "0.28.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e" checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
dependencies = [ dependencies = [
"python3-dll-a",
"target-lexicon", "target-lexicon",
] ]
@ -93,6 +110,15 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "python3-dll-a"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d80ba7540edb18890d444c5aa8e1f1f99b1bdf26fb26ae383135325f4a36042b"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.45" version = "1.0.45"
@ -104,19 +130,25 @@ dependencies = [
[[package]] [[package]]
name = "reconcile-text" name = "reconcile-text"
version = "0.12.0" version = "0.12.1"
dependencies = [ dependencies = [
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "reconcile-text-python" name = "reconcile-text-python"
version = "0.12.0" version = "0.12.1"
dependencies = [ dependencies = [
"pyo3", "pyo3",
"reconcile-text", "reconcile-text",
] ]
[[package]]
name = "shlex"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.117" version = "2.0.117"

View file

@ -1,6 +1,6 @@
[package] [package]
name = "reconcile-text-python" name = "reconcile-text-python"
version = "0.12.0" version = "0.12.1"
edition = "2024" edition = "2024"
rust-version = "1.94" rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"] authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
@ -13,4 +13,4 @@ crate-type = ["cdylib"]
[dependencies] [dependencies]
reconcile-text = { path = ".." } reconcile-text = { path = ".." }
pyo3 = { version = "0.28.3", features = ["extension-module", "abi3-py39"] } pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py39", "generate-import-lib"] }

View file

@ -4,7 +4,7 @@ build-backend = "maturin"
[project] [project]
name = "reconcile-text" name = "reconcile-text"
version = "0.12.0" version = "0.12.1"
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 = { text = "MIT" } license = { text = "MIT" }

View file

@ -168,7 +168,7 @@ wheels = [
[[package]] [[package]]
name = "reconcile-text" name = "reconcile-text"
version = "0.12.0" version = "0.12.1"
source = { editable = "." } source = { editable = "." }
[package.dev-dependencies] [package.dev-dependencies]