Skip to content

Commit

Permalink
Merge branch 'release/0.27.11/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Velin92 committed Jun 18, 2024
2 parents c64c052 + 80bb9c6 commit 8a7f6b3
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion MatrixSDK.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion MatrixSDK/Data/Store/MXFileStore/MXFileStore.m
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion MatrixSDK/MatrixSDKVersion.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

#import <Foundation/Foundation.h>

NSString *const MatrixSDKVersion = @"0.27.10";
NSString *const MatrixSDKVersion = @"0.27.11";
4 changes: 3 additions & 1 deletion MatrixSDK/Utils/MXTools.m
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ + (void)initialize
@(MXEventTypePollResponse) : kMXEventTypeStringPollResponseMSC3381,
@(MXEventTypePollEnd) : kMXEventTypeStringPollEndMSC3381,
@(MXEventTypeBeaconInfo) : kMXEventTypeStringBeaconInfoMSC3672,
@(MXEventTypeBeacon) : kMXEventTypeStringBeaconMSC3672
@(MXEventTypeBeacon) : kMXEventTypeStringBeaconMSC3672,

@(MXEventTypeRoomRetention): kMXEventTypeStringRoomRetention
};

eventTypeMapStringToEnum = @{
Expand Down
22 changes: 15 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
==============

Expand All @@ -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 <https://github.com/CocoaPods/CocoaPods/issues/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 <https://github.com/matrix-org/matrix-rust-sdk>`_
and its respective FFI bindings which are available as a `Swift package <https://github.com/matrix-org/matrix-rust-components-swift/>`_.
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
=======================

Expand All @@ -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
=======
Expand Down

0 comments on commit 8a7f6b3

Please sign in to comment.