Skip to content
This repository has been archived by the owner on Dec 12, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/0.12.24/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ismailgulek committed Oct 13, 2020
2 parents 2477f1a + a1ebd05 commit e0ab16d
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 10 deletions.
27 changes: 27 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
Changes in 0.12.24 (2020-10-13)
=================================================

✨ Features
*

🙌 Improvements
*

🐛 Bugfix
*

⚠️ API Changes
*

🗣 Translations
*

🧱 Build
*

Others
*

Improvements:
* Upgrade MatrixSDK version ([v0.16.18](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.16.18)).

Changes in 0.12.23 (2020-10-09)
=================================================

Expand Down
4 changes: 2 additions & 2 deletions MatrixKit.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "MatrixKit"
s.version = "0.12.23"
s.version = "0.12.24"
s.summary = "The Matrix reusable UI library for iOS based on MatrixSDK."

s.description = <<-DESC
Expand All @@ -23,7 +23,7 @@ Pod::Spec.new do |s|

s.swift_version = '5.0'

s.dependency 'MatrixSDK', "0.16.17"
s.dependency 'MatrixSDK', "0.16.18"
s.dependency 'HPGrowingTextView', '~> 1.1'
s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
s.dependency 'DTCoreText', '~> 1.6.23'
Expand Down
22 changes: 22 additions & 0 deletions MatrixKit.xcodeproj/xcshareddata/IDETemplateMacros.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>FILEHEADER</key>
<string>
// Copyright 2020 The Matrix.org Foundation C.I.C
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion MatrixKit/MatrixKitVersion.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

#import <Foundation/Foundation.h>

NSString *const MatrixKitVersion = @"0.12.23";
NSString *const MatrixKitVersion = @"0.12.24";
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do

# Different flavours of pods to Matrix SDK
# The tagged version on which this version of MatrixKit has been built
pod 'MatrixSDK', '0.16.17'
pod 'MatrixSDK', '0.16.18'

# The lastest release available on the CocoaPods repository
#pod 'MatrixSDK'
Expand Down
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ PODS:
- JSQSystemSoundPlayer (2.0.1)
- libbase58 (0.1.4)
- libPhoneNumber-iOS (0.9.15)
- MatrixSDK (0.16.17):
- MatrixSDK/Core (= 0.16.17)
- MatrixSDK/Core (0.16.17):
- MatrixSDK (0.16.18):
- MatrixSDK/Core (= 0.16.18)
- MatrixSDK/Core (0.16.18):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.2.2)
- libbase58 (~> 0.1.4)
Expand All @@ -62,7 +62,7 @@ DEPENDENCIES:
- HPGrowingTextView (~> 1.1)
- JSQMessagesViewController (~> 7.2.0)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.16.17)
- MatrixSDK (= 0.16.18)

SPEC REPOS:
trunk:
Expand Down Expand Up @@ -91,10 +91,10 @@ SPEC CHECKSUMS:
JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
MatrixSDK: f0cda22f265a2cd5555f843b2fc5003575aced56
MatrixSDK: 7bdaee197004919ae34670d5ba043d5bff95e4df
OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
Realm: 4eb04d7487bd43c0581256f40b424eafb711deff

PODFILE CHECKSUM: 1c50fd421a5201076069db9277b27925b9f55518
PODFILE CHECKSUM: e88ba23066d2bffbe17e53ff64f68811bcfc138b

COCOAPODS: 1.9.3

0 comments on commit e0ab16d

Please sign in to comment.