Merge branch 'release/0.20.13/master'

matrix-org · Dec 6, 2021 · 3647f9e · 3647f9e
2 parents cfd839e + 068bcc0
commit 3647f9e
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 23 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 0.20.13 (2021-12-06)
+
+Others
+
+- Replace semantic imports with classic ones to enable use of the SDK in Kotlin Multiplatform Mobile projects ([#5046](https://github.com/vector-im/element-ios/issues/5046))
+
+
 ## Changes in 0.20.12 (2021-12-06)
 
 🐛 Bugfixes

diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.20.12"
+  s.version      = "0.20.13"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

diff --git a/MatrixSDK/ContentScan/Data/MXAntivirusScanStatusFormatter.h b/MatrixSDK/ContentScan/Data/MXAntivirusScanStatusFormatter.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXAntivirusScanStatus.h"
 
 /**

diff --git a/MatrixSDK/ContentScan/Data/MXEventScan.h b/MatrixSDK/ContentScan/Data/MXEventScan.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXAntivirusScanStatus.h"
 
 @class MXMediaScan;

diff --git a/MatrixSDK/ContentScan/Data/MXMediaScan.h b/MatrixSDK/ContentScan/Data/MXMediaScan.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXAntivirusScanStatus.h"
 
 /**

diff --git a/MatrixSDK/ContentScan/Data/Store/MXEventScanStore.h b/MatrixSDK/ContentScan/Data/Store/MXEventScanStore.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXAntivirusScanStatus.h"
 #import "MXEventScanStoreDelegate.h"
 

diff --git a/MatrixSDK/ContentScan/Data/Store/MXMediaScanStore.h b/MatrixSDK/ContentScan/Data/Store/MXMediaScanStore.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXAntivirusScanStatus.h"
 #import "MXMediaScan.h"
 #import "MXMediaScanStoreDelegate.h"

diff --git a/MatrixSDK/ContentScan/Data/Store/MXMediaScanStoreDelegate.h b/MatrixSDK/ContentScan/Data/Store/MXMediaScanStoreDelegate.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 @class MXMediaScanStore, MXMediaScan;
 

diff --git a/MatrixSDK/ContentScan/Data/Store/Realm/Event/MXRealmEventScanMapper.h b/MatrixSDK/ContentScan/Data/Store/Realm/Event/MXRealmEventScanMapper.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 #import "MXEventScan.h"
 #import "MXRealmEventScan.h"

diff --git a/MatrixSDK/ContentScan/Data/Store/Realm/Event/MXRealmEventScanStore.h b/MatrixSDK/ContentScan/Data/Store/Realm/Event/MXRealmEventScanStore.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXEventScanStore.h"
 #import "MXScanRealmProvider.h"
 

diff --git a/MatrixSDK/ContentScan/Data/Store/Realm/Media/MXRealmMediaScanStore.h b/MatrixSDK/ContentScan/Data/Store/Realm/Media/MXRealmMediaScanStore.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXAntivirusScanStatus.h"
 #import "MXMediaScanStore.h"
 #import "MXRealmMediaScan.h"

diff --git a/MatrixSDK/ContentScan/MXScanManager.h b/MatrixSDK/ContentScan/MXScanManager.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 #pragma mark - Constants
 

diff --git a/MatrixSDK/Crypto/Dehydration/MXDehydrationService.h b/MatrixSDK/Crypto/Dehydration/MXDehydrationService.h
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 @class MXCrypto;
 @class MXRestClient;

diff --git a/MatrixSDK/Data/MXRoomNameDefaultStringLocalizer.h b/MatrixSDK/Data/MXRoomNameDefaultStringLocalizer.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 #import "MXRoomNameStringLocalizerProtocol.h"
 

diff --git a/MatrixSDK/Data/MXRoomNameStringLocalizerProtocol.h b/MatrixSDK/Data/MXRoomNameStringLocalizerProtocol.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/MatrixSDK/Data/MXSendReplyEventDefaultStringLocalizer.h b/MatrixSDK/Data/MXSendReplyEventDefaultStringLocalizer.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "MXSendReplyEventStringLocalizerProtocol.h"
 
 /**

diff --git a/MatrixSDK/Data/MXSendReplyEventStringLocalizerProtocol.h b/MatrixSDK/Data/MXSendReplyEventStringLocalizerProtocol.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.20.12";
+NSString *const MatrixSDKVersion = @"0.20.13";
diff --git a/MatrixSDK/Utils/Realm/MXRealmHelper.h b/MatrixSDK/Utils/Realm/MXRealmHelper.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 @class RLMRealmConfiguration;
 

diff --git a/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.h b/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.h
@@ -16,7 +16,7 @@
 
 #if TARGET_OS_IPHONE
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m b/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m
@@ -18,9 +18,9 @@
 
 #import "MXCallKitAdapter.h"
 
-@import AVFoundation;
-@import CallKit;
-@import UIKit;
+#import <AVFoundation/AVFoundation.h>
+#import <CallKit/CallKit.h>
+#import <UIKit/UIKit.h>
 
 #import "MXCall.h"
 #import "MXCallAudioSessionConfigurator.h"

diff --git a/MatrixSDK/VoIP/CallKit/MXCallKitConfiguration.h b/MatrixSDK/VoIP/CallKit/MXCallKitConfiguration.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN