diff --git a/.changes/nfc.md b/.changes/nfc.md deleted file mode 100644 index 6eb7676e1..000000000 --- a/.changes/nfc.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -nfc: patch -nfc-js: patch ---- - -Expect a `NFCTag` as input and return a `ScanResponse` in the `scan` function. \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index b73674a00..25c6f7111 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -207,7 +207,7 @@ checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "api" -version = "2.0.46" +version = "2.0.47" dependencies = [ "log", "serde", @@ -6660,7 +6660,7 @@ dependencies = [ [[package]] name = "tauri-plugin-nfc" -version = "2.3.5" +version = "2.3.6" dependencies = [ "log", "serde", diff --git a/examples/api/CHANGELOG.md b/examples/api/CHANGELOG.md index c08be7ede..5a10897a4 100644 --- a/examples/api/CHANGELOG.md +++ b/examples/api/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.43] + +### Dependencies + +- Upgraded to `nfc-js@2.3.6` + ## \[2.0.42] ### Dependencies diff --git a/examples/api/package.json b/examples/api/package.json index 8a78158e7..e71fec060 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -1,7 +1,7 @@ { "name": "api", "private": true, - "version": "2.0.42", + "version": "2.0.43", "type": "module", "scripts": { "dev": "vite --clearScreen false", @@ -21,7 +21,7 @@ "@tauri-apps/plugin-global-shortcut": "workspace:*", "@tauri-apps/plugin-haptics": "workspace:*", "@tauri-apps/plugin-http": "workspace:*", - "@tauri-apps/plugin-nfc": "workspace:*", + "@tauri-apps/plugin-nfc": "2", "@tauri-apps/plugin-notification": "workspace:*", "@tauri-apps/plugin-opener": "workspace:*", "@tauri-apps/plugin-os": "workspace:*", diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md index 96a2cab40..ee936000f 100644 --- a/examples/api/src-tauri/CHANGELOG.md +++ b/examples/api/src-tauri/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.47] + +### Dependencies + +- Upgraded to `nfc@2.3.6` + ## \[2.0.46] ### Dependencies diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index ec8b6c3d4..f9a788d87 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "api" publish = false -version = "2.0.46" +version = "2.0.47" description = "An example Tauri Application showcasing the api" edition = "2021" rust-version = { workspace = true } @@ -62,7 +62,7 @@ tauri-plugin-window-state = { path = "../../../plugins/window-state", version = [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.5" } -tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.5" } +tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.6" } tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.2" } tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.2" } tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.2" } diff --git a/plugins/nfc/CHANGELOG.md b/plugins/nfc/CHANGELOG.md index 2dd0bc614..d48a498d2 100644 --- a/plugins/nfc/CHANGELOG.md +++ b/plugins/nfc/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.3.6] + +- [`52672616`](https://github.com/tauri-apps/plugins-workspace/commit/526726162f8ddddf9469797436123704a261df87) ([#3419](https://github.com/tauri-apps/plugins-workspace/pull/3419) by [@pascalauroboa](https://github.com/tauri-apps/plugins-workspace/../../pascalauroboa)) Expect a `NFCTag` as input and return a `ScanResponse` in the `scan` function. + ## \[2.3.5] - [`ab037b70`](https://github.com/tauri-apps/plugins-workspace/commit/ab037b70d6fb54f1ad07d5fe21c41bd1997b34dd) ([#3339](https://github.com/tauri-apps/plugins-workspace/pull/3339) by [@crazy-genius](https://github.com/tauri-apps/plugins-workspace/../../crazy-genius)) Fixed syntax error in kotlin files potentially causing issues when trying to write to tags when no prior session existed. diff --git a/plugins/nfc/Cargo.toml b/plugins/nfc/Cargo.toml index e4e7360c8..b68022a8b 100644 --- a/plugins/nfc/Cargo.toml +++ b/plugins/nfc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-nfc" -version = "2.3.5" +version = "2.3.6" description = "Read and write NFC tags on Android and iOS." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json index 010b34a33..366bf1c43 100644 --- a/plugins/nfc/package.json +++ b/plugins/nfc/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-nfc", - "version": "2.3.5", + "version": "2.3.6", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90ed78a66..fa89490ec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,8 +81,8 @@ importers: specifier: workspace:* version: link:../../plugins/http '@tauri-apps/plugin-nfc': - specifier: workspace:* - version: link:../../plugins/nfc + specifier: '2' + version: 2.3.5 '@tauri-apps/plugin-notification': specifier: workspace:* version: link:../../plugins/notification @@ -1126,6 +1126,9 @@ packages: '@tauri-apps/plugin-dialog@2.7.1': resolution: {integrity: sha512-OK1UBXYt+ojcmxMktzzuyonYIFta8CmAASpX+CA+DTGK24KlHjhYI6x2iOJ/TjZF4N7/ACK1oFmEOjIY9IhzOQ==} + '@tauri-apps/plugin-nfc@2.3.5': + resolution: {integrity: sha512-6w6tY9maiA+YInVS3i5sEPthetZm9/9RR6nB4xAn4BbLgkt+Udd5LWBZxAlfluvKJZn7Svnkd0fVm7juf3YNXw==} + '@tauri-apps/plugin-store@2.4.3': resolution: {integrity: sha512-9LWPj9yMphRi9czEtUv87XHbl1b6xgd9EXpPrUnq6nG7+nbtoF84d4Kwz9xhAv/Hf30sr58pq7EOlyI936y8qw==} @@ -2479,6 +2482,10 @@ snapshots: dependencies: '@tauri-apps/api': 2.11.0 + '@tauri-apps/plugin-nfc@2.3.5': + dependencies: + '@tauri-apps/api': 2.11.0 + '@tauri-apps/plugin-store@2.4.3': dependencies: '@tauri-apps/api': 2.11.0