Improve generated Swift header imports

MatrixKit.podspec

@@ -33,12 +33,16 @@ Pod::Spec.new do |s|
 
  s.subspec 'Core' do |core|
  core.source_files = "MatrixKit", "MatrixKit/**/*.{h,m,swift}", "Libs/**/*.{h,m,swift}"
+ core.exclude_files = ['MatrixKit/MatrixKit-Bridging-Header.h']
+ core.private_header_files = ['MatrixKit/Utils/MXKSwiftHeader.h']
  core.resources = ["MatrixKit/**/*.{xib}", "MatrixKit/Assets/MatrixKitAssets.bundle"]
  core.dependency 'DTCoreText'
  end
 
  s.subspec 'AppExtension' do |ext|
  ext.source_files = "MatrixKit", "MatrixKit/**/*.{h,m,swift}", "Libs/**/*.{h,m,swift}"
+ ext.exclude_files = ['MatrixKit/MatrixKit-Bridging-Header.h']
+ ext.private_header_files = ['MatrixKit/Utils/MXKSwiftHeader.h']
  ext.resources = ["MatrixKit/**/*.{xib}", "MatrixKit/Assets/MatrixKitAssets.bundle"]
  ext.dependency 'DTCoreText/Extension'
  end

MatrixKit/Categories/MXEvent+MatrixKit.h

@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-#import <MatrixSDK/MatrixSDK.h>
-
 #import "MXKEventFormatter.h"
 
 /**

MatrixKit/Categories/NSBundle+MatrixKit.h

@@ -16,8 +16,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import <MatrixSDK/MatrixSDK.h>
-
 /**
  Define a `NSBundle` category at MatrixKit level to retrieve images and sounds from MatrixKit Assets bundle.
  */

MatrixKit/Controllers/MXKRecentListViewController.m

@@ -21,7 +21,8 @@
 
 #import "MXKInterleavedRecentsDataSource.h"
 #import "MXKInterleavedRecentTableViewCell.h"
-#import <MatrixSDK/MatrixSDK-Swift.h>
+
+#import "MXKSwiftHeader.h"
 
 @interface MXKRecentListViewController ()
 {

MatrixKit/MatrixKit.h

@@ -17,8 +17,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import <MatrixSDK/MatrixSDK.h>
-
 #import "MXKConstants.h"
 
 #import "MXKAppSettings.h"
@@ -153,4 +151,3 @@
 #import "MXKSessionGroupsDataSource.h"
 #import "MXKGroupListViewController.h"
 #import "MXKGroupTableViewCell.h"
-#import "MXKSwiftHeader.h"

MatrixKit/Models/RoomList/MXKRecentCellData.h

@@ -15,7 +15,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <MatrixSDK/MatrixSDK.h>
 
 #import "MXKRecentCellDataStoring.h"
 

MatrixKit/Models/RoomList/MXKRecentCellData.m

@@ -17,9 +17,12 @@
 
 #import "MXKRecentCellData.h"
 
+@import MatrixSDK;
+
 #import "MXKDataSource.h"
 #import "MXEvent+MatrixKit.h"
-#import <MatrixSDK/MatrixSDK-Swift.h>
+
+#import "MXKSwiftHeader.h"
 
 @implementation MXKRecentCellData
 @synthesize roomSummary, dataSource, lastEventDate;

MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.h

@@ -16,7 +16,6 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <MatrixSDK/MatrixSDK.h>
 
 #import "MXKConstants.h"
 #import "MXKDataSource.h"

MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.m

@@ -17,8 +17,11 @@
 
 #import "MXKSessionRecentsDataSource.h"
 
+@import MatrixSDK;
+
 #import "MXKRoomDataSourceManager.h"
-#import <MatrixSDK/MatrixSDK-Swift.h>
+
+#import "MXKSwiftHeader.h"
 
 #pragma mark - Constant definitions
 NSString *const kMXKRecentCellIdentifier = @"kMXKRecentCellIdentifier";

Samples/MatrixKitSample/MXKSampleJSQMessagesViewController.m

@@ -22,6 +22,8 @@
 
 #import <MobileCoreServices/MobileCoreServices.h>
 
+#import "MXKSwiftHeader.h"
+
 @interface MXKSampleJSQMessagesViewController ()
 {
  /**

changelog.d/5194.bugfix

@@ -0,0 +1 @@
+Improve generated Swift header imports.