diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ce97bba7f..920396d077 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.5](https://github.com/vector-im/riot-web/releases/tag/v1.6.5) (2020-06-16) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.4...v1.6.5) + +* Upgrade to JS SDK 6.2.2 and React SDK 2.7.2 + Changes in [1.6.4](https://github.com/vector-im/riot-web/releases/tag/v1.6.4) (2020-06-05) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.3...v1.6.4) diff --git a/package.json b/package.json index c02296b321..486ee6fad3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.4", + "version": "1.6.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -60,8 +60,8 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "6.2.2", + "matrix-react-sdk": "2.7.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index cd612b7bb4..7e620c9e21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6965,9 +6965,10 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "6.2.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ebe66bdd6e0f6edbc60be1612c5a1fc0c9ea092c" +matrix-js-sdk@6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz#103d951f61945217b110962f55ae43996756f615" + integrity sha512-uTXmKVzl7GXM3R70cl2E87H+mtwN3ILqPeB80Z/2ITN9Vaf9pMURCCAuHePEBXbhnD7DOZj7Cke42uP+ByR6Hw== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" @@ -6987,9 +6988,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "2.7.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e4aeabe5a6158231015c3203d11fb990c7815ec3" +matrix-react-sdk@2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.7.2.tgz#b74d390695326b90b7472a8f02790cfb225d73ad" + integrity sha512-zBbUbHaROikJo2lOZsf3+K1tJYbSn2IZN08Q0JF5hjwBOiGMD4trhF5osaJIhyrN4qVlJFhXxhDQOMA3UNKXDg== dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7017,7 +7019,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "6.2.2" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1"