From 77ab08a35757f01e75f992d351a364fd080a223d Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Tue, 11 Apr 2023 12:03:24 +0100 Subject: [PATCH 1/4] Enable Rust Crypto for all users --- Riot/Experiments/CryptoSDKFeature.swift | 2 +- RiotTests/SessionCreatorTests.swift | 3 ++- changelog.d/pr-7485.change | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelog.d/pr-7485.change diff --git a/Riot/Experiments/CryptoSDKFeature.swift b/Riot/Experiments/CryptoSDKFeature.swift index 1bcff8a43..e52fc637b 100644 --- a/Riot/Experiments/CryptoSDKFeature.swift +++ b/Riot/Experiments/CryptoSDKFeature.swift @@ -52,7 +52,7 @@ import MatrixSDKCrypto init( remoteFeature: RemoteFeaturesClientProtocol = PostHogAnalyticsClient.shared, - localTargetPercentage: Double = 0.5 + localTargetPercentage: Double = 1 ) { self.remoteFeature = remoteFeature self.localFeature = PhasedRolloutFeature( diff --git a/RiotTests/SessionCreatorTests.swift b/RiotTests/SessionCreatorTests.swift index dbc28c728..688313756 100644 --- a/RiotTests/SessionCreatorTests.swift +++ b/RiotTests/SessionCreatorTests.swift @@ -25,8 +25,9 @@ class SessionCreatorTests: XCTestCase { let mockIS = "mock_identity_server" let credentials = MXCredentials(homeServer: "mock_home_server", - userId: "mock_user_id", + userId: "@mock_user_id:localhost", accessToken: "mock_access_token") + credentials.deviceId = "mock_device_id" let client = MXRestClient(credentials: credentials) client.identityServer = mockIS let session = await sessionCreator.createSession(credentials: credentials, client: client, removeOtherAccounts: false) diff --git a/changelog.d/pr-7485.change b/changelog.d/pr-7485.change new file mode 100644 index 000000000..582ebf504 --- /dev/null +++ b/changelog.d/pr-7485.change @@ -0,0 +1 @@ +Crypto: Enable Rust Crypto for all users From 7e87e0a2e56bcf3e58659bc0b697b47fa30be30f Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Wed, 12 Apr 2023 16:53:25 +0100 Subject: [PATCH 2/4] changelog.d: Upgrade MatrixSDK version ([v0.26.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.7)). --- 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 69908f4d4..dea3ab8b7 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.10.9 -CURRENT_PROJECT_VERSION = 1.10.9 +MARKETING_VERSION = 1.10.10 +CURRENT_PROJECT_VERSION = 1.10.10 diff --git a/Podfile b/Podfile index ec141c86d..f716233ae 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.6' +$matrixSDKVersion = '= 0.26.7' # $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..fbe0ca3c4 --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.26.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.7)). \ No newline at end of file From 05614210f0c611e10658316f63cdcad0cc99b357 Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Wed, 12 Apr 2023 16:53:26 +0100 Subject: [PATCH 3/4] version++ --- CHANGES.md | 8 ++++++++ changelog.d/pr-7485.change | 1 - changelog.d/x-nolink-0.change | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/pr-7485.change delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index 033842289..af7fdc039 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +## Changes in 1.10.10 (2023-04-12) + +🙌 Improvements + +- Crypto: Enable Rust Crypto for all users ([#7485](https://github.com/vector-im/element-ios/pull/7485)) +- Upgrade MatrixSDK version ([v0.26.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.7)). + + ## Changes in 1.10.9 (2023-04-04) 🙌 Improvements diff --git a/changelog.d/pr-7485.change b/changelog.d/pr-7485.change deleted file mode 100644 index 582ebf504..000000000 --- a/changelog.d/pr-7485.change +++ /dev/null @@ -1 +0,0 @@ -Crypto: Enable Rust Crypto for all users diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index fbe0ca3c4..000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.26.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.7)). \ No newline at end of file From a7484a9c98725e331bbc817882f12931da1d184a Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Wed, 12 Apr 2023 17:38:38 +0100 Subject: [PATCH 4/4] finish version++ --- Podfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index fcb75095b..c4d534f96 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.6): - - MatrixSDK/Core (= 0.26.6) - - MatrixSDK/Core (0.26.6): + - MatrixSDK (0.26.7): + - MatrixSDK/Core (= 0.26.7) + - MatrixSDK/Core (0.26.7): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.3.2) + - MatrixSDKCrypto (= 0.3.3) - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.26.6): + - MatrixSDK/JingleCallStack (0.26.7): - JitsiMeetSDKLite (= 7.0.1-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.3.2) + - MatrixSDKCrypto (0.3.3) - 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.6) - - MatrixSDK/JingleCallStack (= 0.26.6) + - MatrixSDK (= 0.26.7) + - MatrixSDK/JingleCallStack (= 0.26.7) - OLMKit - PostHog (~> 2.0.0) - ReadMoreTextView (~> 3.0.1) @@ -187,8 +187,8 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: 8179c184d819782282f47dab16ce6c2b68ef8a74 - MatrixSDKCrypto: 7073c382c484cb8ba7dba0a83e112ead96d3bbfd + MatrixSDK: 1de7cd06bef00fabf5693eabcdcdbf2aa1978063 + MatrixSDKCrypto: 427dbb126a3e3f97cadf9fc407abf17d365b4b39 OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d @@ -208,6 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 54848168ab5303c9126626395886cd85f27a44b3 +PODFILE CHECKSUM: c063d05ddb39617ab9a259c4c9c6b57da2e6d8b6 COCOAPODS: 1.11.3