diff --git a/bin/.act-0.2.59.pkg b/bin/.act-0.2.60.pkg similarity index 100% rename from bin/.act-0.2.59.pkg rename to bin/.act-0.2.60.pkg diff --git a/bin/act b/bin/act index 53572d96ac..8bfa7e3564 120000 --- a/bin/act +++ b/bin/act @@ -1 +1 @@ -.act-0.2.59.pkg \ No newline at end of file +.act-0.2.60.pkg \ No newline at end of file diff --git a/examples/go/echo/go.mod b/examples/go/echo/go.mod index c7fa826d65..95a9341f43 100644 --- a/examples/go/echo/go.mod +++ b/examples/go/echo/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.12.1 // indirect + github.com/alecthomas/types v0.13.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/examples/go/echo/go.sum b/examples/go/echo/go.sum index 11ff6415dc..81dd8e2438 100644 --- a/examples/go/echo/go.sum +++ b/examples/go/echo/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.12.1 h1:W2GwVQUv5kND435RyLS4G6rrJQUbbY67E6l0JV2wEHU= -github.com/alecthomas/types v0.12.1/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.13.0 h1:kaXFugLniPpC1aKpFT/SetRix9U75ZUP9nPz1IupgN8= +github.com/alecthomas/types v0.13.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 44b6901329..943ab6e4b1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11,7 +11,7 @@ "@bufbuild/protoc-gen-es": "1.7.2", "@connectrpc/connect": "^1.1.2", "@connectrpc/connect-web": "^1.1.2", - "@connectrpc/protoc-gen-connect-es": "1.3.0", + "@connectrpc/protoc-gen-connect-es": "1.4.0", "@headlessui/react": "1.7.18", "@heroicons/react": "2.1.1", "@monaco-editor/react": "4.6.0", @@ -19,14 +19,14 @@ "@svgdotjs/svg.panzoom.js": "2.1.2", "@tailwindcss/forms": "^0.5.6", "@vitejs/plugin-react": "^4.0.4", - "@viz-js/viz": "3.3.1", + "@viz-js/viz": "3.4.0", "fnv1a": "^1.1.1", "highlight.js": "^11.8.0", "json-schema": "0.4.0", "json-schema-faker": "0.5.6", "react": "18.2.0", "react-dom": "18.2.0", - "react-router-dom": "6.22.1", + "react-router-dom": "6.22.2", "reactflow": "11.10.4", "tailwindcss": "^3.3.3", "vite": "^4.4.9" @@ -38,12 +38,12 @@ "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "14.2.1", "@types/p5": "1.7.6", - "@types/react": "18.2.58", + "@types/react": "18.2.61", "@types/react-dom": "18.2.19", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", "@typescript-eslint/typescript-estree": "6.21.0", - "autoprefixer": "10.4.17", + "autoprefixer": "10.4.18", "buffer": "^6.0.3", "chokidar": "3.6.0", "eslint": "8.57.0", @@ -57,7 +57,7 @@ "lint-staged": "15.2.2", "npm-run-all2": "6.1.2", "postcss": "8.4.35", - "postcss-nesting": "12.0.3", + "postcss-nesting": "12.0.4", "prettier": "3.2.5", "process": "^0.11.10", "start-server-and-test": "2.0.3", @@ -804,29 +804,29 @@ } }, "node_modules/@connectrpc/connect": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@connectrpc/connect/-/connect-1.3.0.tgz", - "integrity": "sha512-kTeWxJnLLtxKc2ZSDN0rIBgwfP8RwcLknthX4AKlIAmN9ZC4gGnCbwp+3BKcP/WH5c8zGBAWqSY3zeqCM+ah7w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@connectrpc/connect/-/connect-1.4.0.tgz", + "integrity": "sha512-vZeOkKaAjyV4+RH3+rJZIfDFJAfr+7fyYr6sLDKbYX3uuTVszhFe9/YKf5DNqrDb5cKdKVlYkGn6DTDqMitAnA==", "peerDependencies": { "@bufbuild/protobuf": "^1.4.2" } }, "node_modules/@connectrpc/connect-web": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@connectrpc/connect-web/-/connect-web-1.3.0.tgz", - "integrity": "sha512-8HSY8x6douX1LcSFsGEUdjs9jwBe9X+LxkCI8hCtH7vKUCZieQqkRWstoApeIJchHYTaQYqwy2ImKnvwyWwruA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@connectrpc/connect-web/-/connect-web-1.4.0.tgz", + "integrity": "sha512-13aO4psFbbm7rdOFGV0De2Za64DY/acMspgloDlcOKzLPPs0yZkhp1OOzAQeiAIr7BM/VOHIA3p8mF0inxCYTA==", "peerDependencies": { "@bufbuild/protobuf": "^1.4.2", - "@connectrpc/connect": "1.3.0" + "@connectrpc/connect": "1.4.0" } }, "node_modules/@connectrpc/protoc-gen-connect-es": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@connectrpc/protoc-gen-connect-es/-/protoc-gen-connect-es-1.3.0.tgz", - "integrity": "sha512-UbQN48c0zafo5EFSsh3POIJP6ofYiAgKE1aFOZ2Er4W3flUYihydZdM6TQauPkn7jDj4w9jjLSTTZ9//ecUbPA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@connectrpc/protoc-gen-connect-es/-/protoc-gen-connect-es-1.4.0.tgz", + "integrity": "sha512-/7vQ8Q7mEBhV8qEVh/eifRQlQnf8EJ6weMwCD2DljVAQRlZYcW9SLxjYZhV1uM1ZZqQC7Cw2vvgXRg2XQswHBg==", "dependencies": { - "@bufbuild/protobuf": "^1.6.0", - "@bufbuild/protoplugin": "^1.6.0" + "@bufbuild/protobuf": "^1.7.2", + "@bufbuild/protoplugin": "^1.7.2" }, "bin": { "protoc-gen-connect-es": "bin/protoc-gen-connect-es" @@ -835,8 +835,8 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@bufbuild/protoc-gen-es": "^1.6.0", - "@connectrpc/connect": "1.3.0" + "@bufbuild/protoc-gen-es": "^1.7.2", + "@connectrpc/connect": "1.4.0" }, "peerDependenciesMeta": { "@bufbuild/protoc-gen-es": { @@ -2013,9 +2013,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.1.tgz", - "integrity": "sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.2.tgz", + "integrity": "sha512-+Rnav+CaoTE5QJc4Jcwh5toUpnVLKYbpU6Ys0zqbakqbaLQHeglLVHPfxOiQqdNmUy5C2lXz5dwC6tQNX2JW2Q==", "engines": { "node": ">=14.0.0" } @@ -2814,9 +2814,9 @@ "devOptional": true }, "node_modules/@types/react": { - "version": "18.2.58", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.58.tgz", - "integrity": "sha512-TaGvMNhxvG2Q0K0aYxiKfNDS5m5ZsoIBBbtfUorxdH4NGSXIlYvZxLJI+9Dd3KjeB3780bciLyAb7ylO8pLhPw==", + "version": "18.2.61", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.61.tgz", + "integrity": "sha512-NURTN0qNnJa7O/k4XUkEW2yfygA+NxS0V5h1+kp9jPwhzZy95q3ADoGMP0+JypMhrZBTTgjKAUlTctde1zzeQA==", "devOptional": true, "dependencies": { "@types/prop-types": "*", @@ -3119,9 +3119,9 @@ } }, "node_modules/@viz-js/viz": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@viz-js/viz/-/viz-3.3.1.tgz", - "integrity": "sha512-W78mAW9oS+cV2240KIH84eCb57Js8oU+37LMzbFym7Fraouju1NHmRsJO2eTcnjFHSEQWG06z/m47fqsvMNPFg==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@viz-js/viz/-/viz-3.4.0.tgz", + "integrity": "sha512-9iXjMH9da+sfU3LhJ11X7n+HdhfwVa4R/AvhtSr6w9W1IGPDkeH+L+YHt5PLFRYcbWCviAg23Kicidc/qTdahw==" }, "node_modules/abab": { "version": "2.0.6", @@ -3420,9 +3420,9 @@ "dev": true }, "node_modules/autoprefixer": { - "version": "10.4.17", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz", - "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==", + "version": "10.4.18", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz", + "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==", "dev": true, "funding": [ { @@ -3439,8 +3439,8 @@ } ], "dependencies": { - "browserslist": "^4.22.2", - "caniuse-lite": "^1.0.30001578", + "browserslist": "^4.23.0", + "caniuse-lite": "^1.0.30001591", "fraction.js": "^4.3.7", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -3655,9 +3655,9 @@ } }, "node_modules/browserslist": { - "version": "4.22.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", - "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "funding": [ { "type": "opencollective", @@ -3673,8 +3673,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001580", - "electron-to-chromium": "^1.4.648", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3769,9 +3769,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001581", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz", - "integrity": "sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==", + "version": "1.0.30001593", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz", + "integrity": "sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==", "funding": [ { "type": "opencollective", @@ -4489,9 +4489,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.648", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz", - "integrity": "sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==" + "version": "1.4.690", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz", + "integrity": "sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==" }, "node_modules/emittery": { "version": "0.13.1", @@ -8934,9 +8934,9 @@ } }, "node_modules/postcss-nesting": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.0.3.tgz", - "integrity": "sha512-yrtMRPFNkfZMv9ikBvZ/Eh3RxhpMBKQ3KzD7LCY8+jYVlgju/Mdcxi4JY8bW2Y7ISXw8GTLuF/o+kFtp+yaVfQ==", + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.0.4.tgz", + "integrity": "sha512-WuCe0KnP4vKjLZK8VNoUWKL8ZLOv/5jiM94mHcI3VszLropHwmjotdUyP/ObzqZpXuQKP2Jf9R12vIHKFSStKw==", "dev": true, "funding": [ { @@ -9180,11 +9180,11 @@ } }, "node_modules/react-router": { - "version": "6.22.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.1.tgz", - "integrity": "sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==", + "version": "6.22.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.2.tgz", + "integrity": "sha512-YD3Dzprzpcq+tBMHBS822tCjnWD3iIZbTeSXMY9LPSG541EfoBGyZ3bS25KEnaZjLcmQpw2AVLkFyfgXY8uvcw==", "dependencies": { - "@remix-run/router": "1.15.1" + "@remix-run/router": "1.15.2" }, "engines": { "node": ">=14.0.0" @@ -9194,12 +9194,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.22.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.1.tgz", - "integrity": "sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==", + "version": "6.22.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.2.tgz", + "integrity": "sha512-WgqxD2qySEIBPZ3w0sHH+PUAiamDeszls9tzqMPBDA1YYVucTBXLU7+gtRfcSnhe92A3glPnvSxK2dhNoAVOIQ==", "dependencies": { - "@remix-run/router": "1.15.1", - "react-router": "6.22.1" + "@remix-run/router": "1.15.2", + "react-router": "6.22.2" }, "engines": { "node": ">=14.0.0" diff --git a/frontend/package.json b/frontend/package.json index e616bffd0c..f22bb95ce3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "@bufbuild/protoc-gen-es": "1.7.2", "@connectrpc/connect": "^1.1.2", "@connectrpc/connect-web": "^1.1.2", - "@connectrpc/protoc-gen-connect-es": "1.3.0", + "@connectrpc/protoc-gen-connect-es": "1.4.0", "@headlessui/react": "1.7.18", "@heroicons/react": "2.1.1", "@monaco-editor/react": "4.6.0", @@ -37,14 +37,14 @@ "@svgdotjs/svg.panzoom.js": "2.1.2", "@tailwindcss/forms": "^0.5.6", "@vitejs/plugin-react": "^4.0.4", - "@viz-js/viz": "3.3.1", + "@viz-js/viz": "3.4.0", "fnv1a": "^1.1.1", "highlight.js": "^11.8.0", "json-schema": "0.4.0", "json-schema-faker": "0.5.6", "react": "18.2.0", "react-dom": "18.2.0", - "react-router-dom": "6.22.1", + "react-router-dom": "6.22.2", "reactflow": "11.10.4", "tailwindcss": "^3.3.3", "vite": "^4.4.9" @@ -56,12 +56,12 @@ "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "14.2.1", "@types/p5": "1.7.6", - "@types/react": "18.2.58", + "@types/react": "18.2.61", "@types/react-dom": "18.2.19", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", "@typescript-eslint/typescript-estree": "6.21.0", - "autoprefixer": "10.4.17", + "autoprefixer": "10.4.18", "buffer": "^6.0.3", "chokidar": "3.6.0", "eslint": "8.57.0", @@ -75,7 +75,7 @@ "lint-staged": "15.2.2", "npm-run-all2": "6.1.2", "postcss": "8.4.35", - "postcss-nesting": "12.0.3", + "postcss-nesting": "12.0.4", "prettier": "3.2.5", "process": "^0.11.10", "start-server-and-test": "2.0.3", diff --git a/frontend/src/protos/xyz/block/ftl/v1/console/console_connect.ts b/frontend/src/protos/xyz/block/ftl/v1/console/console_connect.ts index f06ba2d7f9..db225c56ce 100644 --- a/frontend/src/protos/xyz/block/ftl/v1/console/console_connect.ts +++ b/frontend/src/protos/xyz/block/ftl/v1/console/console_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts" // @generated from file xyz/block/ftl/v1/console/console.proto (package xyz.block.ftl.v1.console, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/frontend/src/protos/xyz/block/ftl/v1/ftl_connect.ts b/frontend/src/protos/xyz/block/ftl/v1/ftl_connect.ts index bb841b2d94..e5f00fa74b 100644 --- a/frontend/src/protos/xyz/block/ftl/v1/ftl_connect.ts +++ b/frontend/src/protos/xyz/block/ftl/v1/ftl_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v1.3.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts" // @generated from file xyz/block/ftl/v1/ftl.proto (package xyz.block.ftl.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/go.mod b/go.mod index 42ae841e88..0c12f8011a 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/alecthomas/kong v0.8.1 github.com/alecthomas/kong-toml v0.1.0 github.com/alecthomas/participle/v2 v2.1.1 - github.com/alecthomas/types v0.12.1 + github.com/alecthomas/types v0.13.0 github.com/amacneil/dbmate/v2 v2.12.0 github.com/beevik/etree v1.3.0 github.com/bmatcuk/doublestar/v4 v4.6.1 diff --git a/go.sum b/go.sum index d1b796a0b8..6a4a2109f3 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.12.1 h1:W2GwVQUv5kND435RyLS4G6rrJQUbbY67E6l0JV2wEHU= -github.com/alecthomas/types v0.12.1/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.13.0 h1:kaXFugLniPpC1aKpFT/SetRix9U75ZUP9nPz1IupgN8= +github.com/alecthomas/types v0.13.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/amacneil/dbmate/v2 v2.12.0 h1:2F/Fu/lScBhsQ8UgPg/UPM4QtBBpieZWntDJYaAkGHo= diff --git a/pom.xml b/pom.xml index c30fd7e288..3c9c151b2e 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ 1.9.22 true 4.9.7 - 1.61.1 - 1.5.0 + 1.62.2 + 1.5.2 5.10.2 7.4