Skip to content

Commit 9273a3f

Browse files
mokagiomokagio
committed
Restore using modular import for WordPressData
Clearly the issues documented in some of the usages were temporary due to the transition.
1 parent cbb1715 commit 9273a3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+51
-255
lines changed

‎WordPress/Classes/Categories/Media+Extensions.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
#import <Foundation/Foundation.h>
22
#import <AVFoundation/AVFoundation.h>
33

4-
// For some reason, and only in some files, the modular import does not work.
5-
// Just to be on the safe side, _all_ imports use the angle brackets style.
6-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
7-
// @import WordPressData;
8-
#import <WordPressData/WordPressData.h>
4+
@import WordPressData;
95

106
@interface Media (Extensions)
117

‎WordPress/Classes/Categories/Media+Extensions.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#import "Media+Extensions.h"
22
#import "MediaService.h"
3-
// For some reason, and only in some files, the modular import does not work.
4-
// Just to be on the safe side, _all_ imports use the angle brackets style.
5-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
6-
// @import WordPressData;
7-
#import <WordPressData/WordPressData.h>
3+
@import WordPressData;
84
@import WordPressShared;
95
#ifdef KEYSTONE
106
#import "Keystone-Swift.h"

‎WordPress/Classes/Services/AccountService.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
#import "AccountService.h"
22
#import "BlogService.h"
33

4-
// For some reason, and only in some files, the modular import does not work.
5-
// Just to be on the safe side, _all_ imports use the angle brackets style.
6-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
7-
// @import WordPressData;
8-
#import <WordPressData/WordPressData.h>
4+
@import WordPressData;
95
@import WordPressKit;
106
@import WordPressShared;
117

‎WordPress/Classes/Services/BlogService.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
#else
99
#import "WordPress-Swift.h"
1010
#endif
11-
// For some reason, and only in some files, the modular import does not work.
12-
// Just to be on the safe side, _all_ imports use the angle brackets style.
13-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
14-
// @import WordPressData;
15-
#import <WordPressData/WordPressData.h>
11+
@import WordPressData;
1612
@import WordPressKit;
1713
@import WordPressShared;
1814

‎WordPress/Classes/Services/CommentService.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
#else
66
#import "WordPress-Swift.h"
77
#endif
8-
// For some reason, and only in some files, the modular import does not work.
9-
// Just to be on the safe side, _all_ imports use the angle brackets style.
10-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
11-
// @import WordPressData;
12-
#import <WordPressData/WordPressData.h>
8+
@import WordPressData;
139

1410
@import WordPressShared;
1511

‎WordPress/Classes/Services/Facades/BlogSyncFacade.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
#else
88
#import "WordPress-Swift.h"
99
#endif
10-
// For some reason, and only in some files, the modular import does not work.
11-
// Just to be on the safe side, _all_ imports use the angle brackets style.
12-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
13-
// @import WordPressData;
14-
#import <WordPressData/WordPressData.h>
10+
@import WordPressData;
1511

1612
@import WordPressShared;
1713
@import NSObject_SafeExpectations;

‎WordPress/Classes/Services/MediaService.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#import <Foundation/Foundation.h>
22
#import <Photos/Photos.h>
3-
// For some reason, and only in some files, the modular import does not work.
4-
// Just to be on the safe side, _all_ imports use the angle brackets style.
5-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
6-
// @import WordPressData;
7-
#import <WordPressData/WordPressData.h>
3+
@import WordPressData;
84

95
@class Media;
106
@class RemoteVideoPressVideo;

‎WordPress/Classes/Services/MediaService.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
#import "WordPress-Swift.h"
77
#endif
88

9-
// For some reason, and only in some files, the modular import does not work.
10-
// Just to be on the safe side, _all_ imports use the angle brackets style.
11-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
12-
// @import WordPressData;
13-
#import <WordPressData/WordPressData.h>
9+
@import WordPressData;
1410
@import WordPressKit;
1511
@import WordPressUI;
1612
@import WordPressShared;

‎WordPress/Classes/Services/MenusService.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#import <CoreData/CoreData.h>
2-
// For some reason, and only in some files, the modular import does not work.
3-
// Just to be on the safe side, _all_ imports use the angle brackets style.
4-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
5-
// @import WordPressData;
6-
#import <WordPressData/WordPressData.h>
2+
@import WordPressData;
73

84
NS_ASSUME_NONNULL_BEGIN
95

‎WordPress/Classes/Services/MenusService.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
#else
55
#import "WordPress-Swift.h"
66
#endif
7-
// For some reason, and only in some files, the modular import does not work.
8-
// Just to be on the safe side, _all_ imports use the angle brackets style.
9-
// We shall try to go back to the modular style on Keystone successfully builds for testing.
10-
// @import WordPressData;
11-
#import <WordPressData/WordPressData.h>
7+
@import WordPressData;
128
@import WordPressKit;
139

1410
@implementation MenusService

0 commit comments

Comments
 (0)