From 93da1f192ba7562e3eb9d623e4c87e9ce6843517 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Jun 2020 11:51:11 +0100
Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 6.2.2
---
package.json | 2 +-
yarn.lock | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9e9698414d..47f9d6221f 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
"browser-request": "^0.3.3",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
- "matrix-js-sdk": "6.2.1",
+ "matrix-js-sdk": "6.2.2",
"matrix-react-sdk": "2.7.1",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index e39f4d64d4..f8c3cfc0cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6976,6 +6976,21 @@ matrix-js-sdk@6.2.1:
request "^2.88.0"
unhomoglyph "^1.0.2"
+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"
+ browser-request "^0.3.3"
+ bs58 "^4.0.1"
+ content-type "^1.0.2"
+ loglevel "^1.6.4"
+ qs "^6.5.2"
+ request "^2.88.0"
+ unhomoglyph "^1.0.2"
+
matrix-mock-request@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
From 9ed7c96df632ace8dfa8cb3997a439e9d8e34eac Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Jun 2020 11:51:28 +0100
Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 2.7.2
---
package.json | 2 +-
yarn.lock | 25 +++++--------------------
2 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/package.json b/package.json
index 47f9d6221f..2ee99b4632 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "6.2.2",
- "matrix-react-sdk": "2.7.1",
+ "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 f8c3cfc0cd..ea36b44b65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6961,21 +6961,6 @@ 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@6.2.1:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz#d5f76491a650c0a36fcdd078cff59f2da96edd7b"
- integrity sha512-X12Y2SMg8MOJwE5P3VMsMV/mnQHOmyJkF+FZRida124w4B4tBJouaNxteYyYaH34w+wyaKGxuqEBXecfSpfvbw==
- dependencies:
- "@babel/runtime" "^7.8.3"
- another-json "^0.2.0"
- browser-request "^0.3.3"
- bs58 "^4.0.1"
- content-type "^1.0.2"
- loglevel "^1.6.4"
- qs "^6.5.2"
- request "^2.88.0"
- unhomoglyph "^1.0.2"
-
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"
@@ -6999,10 +6984,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
-matrix-react-sdk@2.7.1:
- version "2.7.1"
- resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.7.1.tgz#bfde7e0d074769b209fa769d8dac6ad255c8b409"
- integrity sha512-xf15VfHv/zoW1FnTdc7Dn0PITc8UuCqGlwCI2sMihp6kXrvsiUxaNkWTXzLbcwwX5Oahc3NQ7dkLaGB2AoXjIA==
+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"
@@ -7030,7 +7015,7 @@ matrix-react-sdk@2.7.1:
is-ip "^2.0.0"
linkifyjs "^2.1.6"
lodash "^4.17.14"
- matrix-js-sdk "6.2.1"
+ matrix-js-sdk "6.2.2"
minimist "^1.2.0"
pako "^1.0.5"
parse5 "^5.1.1"
From fdec64f59cf4d629cfd7cb4a392ba69a53b59497 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Jun 2020 11:53:53 +0100
Subject: [PATCH 3/4] Prepare changelog for v1.6.5
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
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)
From d75045e852966779b13e66ea7df5e2b8e6918f75 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 16 Jun 2020 11:53:53 +0100
Subject: [PATCH 4/4] v1.6.5
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 2ee99b4632..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": {