From b570ef6a1f560b937bae02de0a6498beee6b800d Mon Sep 17 00:00:00 2001 From: Doug Date: Mon, 17 Jun 2024 10:23:09 +0100 Subject: [PATCH 1/5] Prepare for new sprint From 9215e349068fba12277f0faf942eda4a103f6065 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:18:26 +0100 Subject: [PATCH 2/5] Update README. (#1863) --- README.rst | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 8799f5c9b..5ca2d1d08 100644 --- a/README.rst +++ b/README.rst @@ -9,6 +9,7 @@ .. image:: https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg?style=flat-square :target: https://opensource.org/licenses/Apache-2.0 +============== Matrix iOS SDK ============== @@ -20,6 +21,18 @@ This SDK implements an interface to communicate with the Matrix Client/Server API which is defined at http://matrix.org/docs/api/client-server/. +Pod Deprecation +=============== + +The SDK is no longer published directly to Cocopods following recent linting issues +with Xcode 14.3 and greater: `CocoaPods/CocoaPods#11839 `_. +This deprecation *only* covers the published pod, the SDK is still being maintained. + +It is however worth noting that we're now primarily focussed on the `Matrix Rust SDK `_ +and its respective FFI bindings which are available as a `Swift package `_. +This would likely be a more sensible choice for anyone starting a new project using Matrix on Apple platforms. + + Use the SDK in your app ======================= @@ -29,15 +42,10 @@ In order to set this up:: sudo gem install cocoapods pod setup -The best way to add the last release of the Matrix SDK to your application -project is to add the MatrixSDK dependency to your Podfile:: - - pod 'MatrixSDK' +The best way to add the Matrix SDK to your application is to add the MatrixSDK repo to your Podfile:: -If you want to use the develop version of the SDK, use instead: + pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :tag => 'vX.Y.Z' - pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', - :branch => 'develop' Options ======= From 52c0b5bdf8ac52f18aecad50fea24040f3111f5a Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 18 Jun 2024 15:33:39 +0200 Subject: [PATCH 3/5] fix store issue --- MatrixSDK/Data/Store/MXFileStore/MXFileStore.m | 2 +- MatrixSDK/Utils/MXTools.m | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m index 5207df6c6..33d13627d 100644 --- a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m +++ b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m @@ -29,7 +29,7 @@ #import "MatrixSDKSwiftHeader.h" #import "MXFileRoomSummaryStore.h" -static NSUInteger const kMXFileVersion = 82; // Check getUnreadRoomFromStore if you update this value. Delete this comment after +static NSUInteger const kMXFileVersion = 83; // Check getUnreadRoomFromStore if you update this value. Delete this comment after static NSString *const kMXFileStoreFolder = @"MXFileStore"; static NSString *const kMXFileStoreMedaDataFile = @"MXFileStore"; diff --git a/MatrixSDK/Utils/MXTools.m b/MatrixSDK/Utils/MXTools.m index 26e86564e..4377c9915 100644 --- a/MatrixSDK/Utils/MXTools.m +++ b/MatrixSDK/Utils/MXTools.m @@ -140,7 +140,9 @@ + (void)initialize @(MXEventTypePollResponse) : kMXEventTypeStringPollResponseMSC3381, @(MXEventTypePollEnd) : kMXEventTypeStringPollEndMSC3381, @(MXEventTypeBeaconInfo) : kMXEventTypeStringBeaconInfoMSC3672, - @(MXEventTypeBeacon) : kMXEventTypeStringBeaconMSC3672 + @(MXEventTypeBeacon) : kMXEventTypeStringBeaconMSC3672, + + @(MXEventTypeRoomRetention): kMXEventTypeStringRoomRetention }; eventTypeMapStringToEnum = @{ From 096d5f13a6e97341a2b05094207b1221c1689e28 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 18 Jun 2024 15:52:44 +0200 Subject: [PATCH 4/5] version++ --- CHANGES.md | 5 +++++ MatrixSDK.podspec | 2 +- MatrixSDK/MatrixSDKVersion.m | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0b47fde22..e1305179b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 0.27.11 (2024-06-18) + +No significant changes. + + ## Changes in 0.27.10 (2024-06-17) No significant changes. diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec index 60f71c6bb..d786dc03b 100644 --- a/MatrixSDK.podspec +++ b/MatrixSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MatrixSDK" - s.version = "0.27.10" + s.version = "0.27.11" s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)" s.description = <<-DESC diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m index 2c5662a9a..36379dc57 100644 --- a/MatrixSDK/MatrixSDKVersion.m +++ b/MatrixSDK/MatrixSDKVersion.m @@ -16,4 +16,4 @@ #import -NSString *const MatrixSDKVersion = @"0.27.10"; +NSString *const MatrixSDKVersion = @"0.27.11"; From 80bb9c6be65e7f73713dd17640b456cba4c1a0a4 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 18 Jun 2024 16:34:56 +0200 Subject: [PATCH 5/5] finish version++