From a20ae9e1cd2772cf977d395f1cb4debf58e7e3bd Mon Sep 17 00:00:00 2001 From: Ben Francis Date: Mon, 8 Dec 2025 21:02:54 +0000 Subject: [PATCH] Allow pre-release version numbers and bump Zigbee adapter to 2.0.0 - closes #1494 --- addons/zigbee-adapter.json | 24 ++++++++++++------------ schema/list.json | 26 +++++++++++++++++++++----- schema/manifest.json | 26 +++++++++++++++++++++----- schema/package.json | 2 +- 4 files changed, 55 insertions(+), 23 deletions(-) diff --git a/addons/zigbee-adapter.json b/addons/zigbee-adapter.json index 147d60c53..390054aa8 100644 --- a/addons/zigbee-adapter.json +++ b/addons/zigbee-adapter.json @@ -207,11 +207,11 @@ "115" ] }, - "version": "0.23.0", - "url": "https://github.com/WebThingsIO/zigbee-adapter/releases/download/0.23.0/zigbee-adapter-0.23.0-linux-arm-v20.tgz ", - "checksum": "2c28b236e8418724a6f43f0ec1ea34d8ed24a4d2c67340cb2ebae1e6bd09ca5a", + "version": "2.0.0", + "url": "https://github.com/WebThingsIO/zigbee-adapter/releases/download/2.0.0/zigbee-adapter-2.0.0-linux-arm-v20.tgz", + "checksum": "ab942fdfcab131b3111239742ee0a30259f9e3d84fb983ef8b858ae0569f6d86", "gateway": { - "min": "1.0.0", + "min": "2.0.0-beta.1", "max": "*" } }, @@ -223,11 +223,11 @@ "115" ] }, - "version": "0.23.0", - "url": "https://github.com/WebThingsIO/zigbee-adapter/releases/download/0.23.0/zigbee-adapter-0.23.0-linux-arm64-v20.tgz", - "checksum": "a69a3914f819303fffc359d3e6f8ba3befe96203baa039bad39559ddecfcdbaa", + "version": "2.0.0", + "url": "https://github.com/WebThingsIO/zigbee-adapter/releases/download/2.0.0/zigbee-adapter-2.0.0-linux-arm64-v20.tgz", + "checksum": "124dffc2cd65780a5b1c507661946d5219e0ad052d200b3ac47bd5a6cd3b0892", "gateway": { - "min": "1.0.0", + "min": "2.0.0-beta.1", "max": "*" } }, @@ -239,11 +239,11 @@ "115" ] }, - "version": "0.23.0", - "url": "https://github.com/WebThingsIO/zigbee-adapter/releases/download/0.23.0/zigbee-adapter-0.23.0-linux-x64-v20.tgz", - "checksum": "02a3be0945e0d684d8aea49961702346b210dd99ec94788d71a5ff2ad474b337", + "version": "2.0.0", + "url": "https://github.com/WebThingsIO/zigbee-adapter/releases/download/2.0.0/zigbee-adapter-2.0.0-linux-x64-v20.tgz", + "checksum": "784a17cff617a308114cc336639568c0bae06e249f962f8769e82b1f389bd455", "gateway": { - "min": "1.0.0", + "min": "2.0.0-beta.1", "max": "*" } } diff --git a/schema/list.json b/schema/list.json index f182a8514..60f299002 100644 --- a/schema/list.json +++ b/schema/list.json @@ -122,7 +122,7 @@ }, "version": { "type": "string", - "pattern": "^\\d+\\.\\d+\\.\\d+$" + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" }, "url": { "type": "string", @@ -159,12 +159,28 @@ ], "properties": { "min": { - "type": "string", - "pattern": "^(\\d+\\.\\d+\\.\\d+|\\*)$" + "oneOf": [ + { + "type": "string", + "const": "*" + }, + { + "type": "string", + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" + } + ] }, "max": { - "type": "string", - "pattern": "^(\\d+\\.\\d+\\.\\d+|\\*)$" + "oneOf": [ + { + "type": "string", + "const": "*" + }, + { + "type": "string", + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" + } + ] } }, "additionalProperties": false diff --git a/schema/manifest.json b/schema/manifest.json index 35cf29c27..3179e729a 100644 --- a/schema/manifest.json +++ b/schema/manifest.json @@ -110,12 +110,28 @@ ] }, "strict_min_version": { - "type": "string", - "pattern": "^(\\d+\\.\\d+\\.\\d+|\\*)$" + "oneOf": [ + { + "type": "string", + "const": "*" + }, + { + "type": "string", + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" + } + ] }, "strict_max_version": { - "type": "string", - "pattern": "^(\\d+\\.\\d+\\.\\d+|\\*)$" + "oneOf": [ + { + "type": "string", + "const": "*" + }, + { + "type": "string", + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" + } + ] } }, "additionalProperties": false @@ -190,7 +206,7 @@ }, "version": { "type": "string", - "pattern": "^\\d+\\.\\d+\\.\\d+$" + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" }, "web_accessible_resources": { "type": "array", diff --git a/schema/package.json b/schema/package.json index f8acd3596..93c6af99c 100644 --- a/schema/package.json +++ b/schema/package.json @@ -18,7 +18,7 @@ }, "version": { "type": "string", - "pattern": "^\\d+\\.\\d+\\.\\d+$" + "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" }, "display_name": { "type": "string",