From 055856e2572af023b65efe6c641016c2a4ed5399 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 15 Aug 2023 10:12:16 +0100 Subject: [PATCH 1/4] changelog.d: Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)). --- Config/AppVersion.xcconfig | 4 ++-- Podfile | 2 +- changelog.d/x-nolink-0.change | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/x-nolink-0.change diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 46c0099fd..ec41e80dc 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.10.15 -CURRENT_PROJECT_VERSION = 1.10.15 +MARKETING_VERSION = 1.11.0 +CURRENT_PROJECT_VERSION = 1.11.0 diff --git a/Podfile b/Podfile index fda86b718..581fc76b0 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ use_frameworks! # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixSDKVersion = '= 0.26.12' +$matrixSDKVersion = '= 0.27.0' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change new file mode 100644 index 000000000..f3e3d6e74 --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)). \ No newline at end of file From 074f9853c8f56e52fa1658338243666649d09b90 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 15 Aug 2023 10:12:16 +0100 Subject: [PATCH 2/4] version++ --- CHANGES.md | 13 +++++++++++++ changelog.d/7618.change | 1 - changelog.d/7633.bugfix | 1 - changelog.d/pr-7639.bugfix | 1 - changelog.d/x-nolink-0.change | 1 - 5 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/7618.change delete mode 100644 changelog.d/7633.bugfix delete mode 100644 changelog.d/pr-7639.bugfix delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index d2e289625..851c844d4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,16 @@ +## Changes in 1.11.0 (2023-08-15) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)). +- Disable Siri, Share and Reply (from NSE) Extensions. ([#7618](https://github.com/vector-im/element-ios/issues/7618)) + +🐛 Bugfixes + +- Fix bug in SSO URL generation that was non-compliant with the spec. ([#7639](https://github.com/vector-im/element-ios/pull/7639)) +- Fix a crash when opening v11 rooms. ([#7633](https://github.com/vector-im/element-ios/issues/7633)) + + ## Changes in 1.10.14 (2023-06-21) 🙌 Improvements diff --git a/changelog.d/7618.change b/changelog.d/7618.change deleted file mode 100644 index 0cefa0983..000000000 --- a/changelog.d/7618.change +++ /dev/null @@ -1 +0,0 @@ -Disable Siri, Share and Reply (from NSE) Extensions. \ No newline at end of file diff --git a/changelog.d/7633.bugfix b/changelog.d/7633.bugfix deleted file mode 100644 index b7345971e..000000000 --- a/changelog.d/7633.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a crash when opening v11 rooms. \ No newline at end of file diff --git a/changelog.d/pr-7639.bugfix b/changelog.d/pr-7639.bugfix deleted file mode 100644 index 9bbf73b23..000000000 --- a/changelog.d/pr-7639.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix bug in SSO URL generation that was non-compliant with the spec. \ No newline at end of file diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index f3e3d6e74..000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)). \ No newline at end of file From 68ca2f99721e7ee14a20ca717c0ec54f7dba766b Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 15 Aug 2023 10:18:04 +0100 Subject: [PATCH 3/4] Add missing changelog entry. --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 851c844d4..ee4133fae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ ## Changes in 1.11.0 (2023-08-15) +✨ Features + +- Integrate Device Dehydration v2 through the Crypto SDK ([#7630](https://github.com/vector-im/element-ios/pull/7630)) + 🙌 Improvements - Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)). From 0ba26db75531d505022dc1ffd02d26f0cf192550 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 15 Aug 2023 11:09:55 +0100 Subject: [PATCH 4/4] finish version++ --- Podfile.lock | 22 +++++++++---------- .../xcshareddata/xcschemes/Riot.xcscheme | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index fb9bd48ae..988424488 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,20 +39,20 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.26.12): - - MatrixSDK/Core (= 0.26.12) - - MatrixSDK/Core (0.26.12): + - MatrixSDK (0.27.0): + - MatrixSDK/Core (= 0.27.0) + - MatrixSDK/Core (0.27.0): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.3.4) + - MatrixSDKCrypto (= 0.3.12) - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.26.12): + - MatrixSDK/JingleCallStack (0.27.0): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.3.4) + - MatrixSDKCrypto (0.3.12) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) @@ -102,8 +102,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.26.12) - - MatrixSDK/JingleCallStack (= 0.26.12) + - MatrixSDK (= 0.27.0) + - MatrixSDK/JingleCallStack (= 0.27.0) - OLMKit - PostHog (~> 2.0.0) - ReadMoreTextView (~> 3.0.1) @@ -187,8 +187,8 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: 0af737bc461b82d0ec9edd6fdf8f70b02771ebd3 - MatrixSDKCrypto: ac805c22c24f79f349cdbfa065855c73a4c81b51 + MatrixSDK: 981c0e6abd40f0882e1316923edb2b3966d29513 + MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504 OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d @@ -208,6 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: f8d711a31048bfd5981d17b00487a85996b62983 +PODFILE CHECKSUM: f8f66ce4fa24937192a493d3a0a5c2c2e429c8fc COCOAPODS: 1.11.3 diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme index 012a5a109..52ec9a4e1 100644 --- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme +++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme @@ -1,6 +1,6 @@